diff --git a/Step.NC/NcHandler.cs b/Step.NC/NcHandler.cs
index 534bf903..443d6c61 100644
--- a/Step.NC/NcHandler.cs
+++ b/Step.NC/NcHandler.cs
@@ -99,7 +99,7 @@ namespace Step.NC
         {
             if (NcConfig.NcVendor != NC_VENDOR.SIEMENS)
             {
-                // TODO Manare
+                // TODO Fix in the future
                 return File.Exists(path);
             }
             else
@@ -1063,7 +1063,7 @@ namespace Step.NC
                         CreatedByCms = currMaintenance.UserId == null,
                         CanEdit = canEdit,
                         CanPerform = canPerform,
-                        User = performed?.Maintainer == null ? null : (DTOMessageUserModel)performed.Maintainer
+                        Maintainer = performed?.Maintainer == null ? null : (DTOMessageUserModel)performed.Maintainer
                     });
                 }
             }
@@ -1463,7 +1463,7 @@ namespace Step.NC
             if (cmsError.IsError())
                 return cmsError;
 
-            if (NcConfig.NcVendor != NC_VENDOR.SIEMENS)
+            if (NcConfig.NcVendor != NC_VENDOR.SIEMENS && NcConfig.NcVendor != NC_VENDOR.DEMO)
             {
                 config.FamilyOptionActive = true;
                 config.MultitoolOptionActive = true;