fixes for bootstrapping