Workaround for some test failures