Fix Restart*VM* Issues