minor fixes
[git-p4: depot-paths = "//src/minitest-autotest/dev/": change = 9421]