New xvm, minor fixes.