minor fixes to get boot working again