MEDIUM / Fixed issues with VP and VM creation