Fixes for bootstrap script