Improvements to the VM cleaner...