diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmListModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmListModel.java
index ea47ca9dba5..e68075ade98 100644
--- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmListModel.java
+++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmListModel.java
@@ -1326,11 +1326,9 @@ private void onNewTemplate() {
             return;
         }
 
-        if (!model.validateNaming()) {
-            return;
-        }
-
-        if (model.getIsSubTemplate().getEntity()) {
+        if (!model.validate(false)) {
+            model.setIsValid(false);
+        } else if (model.getIsSubTemplate().getEntity()) {
             postNameUniqueCheck();
         } else {
             String name = model.getName().getEntity();
@@ -2193,7 +2191,7 @@ public void executeCommand(UICommand command) {
     }
 
     protected void exportOva() {
-        VM selectedEntity = (VM) getSelectedItem();
+        VM selectedEntity = getSelectedItem();
         if (selectedEntity == null) {
             return;
         }
diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmModelBehaviorBase.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmModelBehaviorBase.java
index 967ec1e2bd0..37a30f2725f 100644
--- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmModelBehaviorBase.java
+++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmModelBehaviorBase.java
@@ -1694,8 +1694,8 @@ public void updateMaxMemory() {
     }
 
     public void updateMemory() {
-        Integer memoryMb = getModel().getMemSize().getEntity();
         AsyncDataProvider.getMinMemoryForOs(new AsyncQuery<>(minMemory -> {
+            Integer memoryMb = getModel().getMemSize().getEntity();
             if (memoryMb == null || memoryMb < minMemory) {
                 getModel().getMemSize().setEntity(minMemory);
             }
@@ -1703,8 +1703,8 @@ public void updateMemory() {
     }
 
     public void updateTotalCpuCores() {
-        int cpuCores = getTotalCpuCores();
         AsyncDataProvider.getMinCpus(new AsyncQuery<>(minCpus -> {
+            int cpuCores = getTotalCpuCores();
             if (cpuCores < minCpus) {
                 getModel().getTotalCPUCores().setEntity(Integer.toString(minCpus));
             }