Fixes to bootstrap.