Kickstart improvements