Update bootstrap, fix base.cfg