Fixes peer test failures
Tweak not to blow MRI