mostly fixing up stuff for bootstrapper to run correctly