More tweaks to boostrap script