fixes to bootstrap