more fixes to spinup