Fixes to bootstrap script