Improve handling of fail-highs in assumed PV