small fixes to bootstrap