bootstrapper fixes