Autoboot improvements