Bugfixes for bootstrapper