Some fixes in datasets and vm creation.
Merge branch 'test' into dev