Minor fixes to the VM cleaner...