Another couple fixes to zkocc test.