Assorted work on the vmfactory.