Intermittent build/test failure fixes