Bugfixes in VMsetup