Kickstart fixes