More fixes for bootstrap test