Improvements to initial value setting