[#3028] Fixup first run. Had to make changes to content of furst run because of changes in the way things work.