Improvements to starting value handling