A couple of compiler fixes for the test.