Make some changes that should improve the ability to find initial values (still not enough for tracker item 3591)