Fix bootstrap some more after testing