Some fixes on the new vm loading.