Some fixes on the new vm loading.
Merge branch 'test' into dev