Fixes peer test failures