'wvmcmdcobe'-related fixes.