Minor improvements to bootstrap.