Couple fixes from running the tests on my slow VM