Fixed VM issues...