Minor changes to bootstrap implementation