Fix minor issues with bootstrap script