Work around issues that aren't relevant to test