Fixed a couple issues during initial vm creation