Index: /trunk/src/VBox/Frontends/VBoxManage/VBoxManageModifyVM.cpp
===================================================================
--- /trunk/src/VBox/Frontends/VBoxManage/VBoxManageModifyVM.cpp	(revision 51258)
+++ /trunk/src/VBox/Frontends/VBoxManage/VBoxManageModifyVM.cpp	(revision 51259)
@@ -1102,5 +1102,5 @@
                 }
                 /* host drive? */
-                else if (!RTStrNICmp(ValueUnion.psz, "host:", 5))
+                else if (!RTStrNICmp(ValueUnion.psz, RT_STR_TUPLE("host:")))
                 {
                     ComPtr<IHost> host;
@@ -1180,5 +1180,5 @@
                     }
                     /* host drive? */
-                    else if (!RTStrNICmp(ValueUnion.psz, "host:", 5))
+                    else if (!RTStrNICmp(ValueUnion.psz, RT_STR_TUPLE("host:")))
                     {
                         ComPtr<IHost> host;
@@ -1703,18 +1703,16 @@
                 CHECK_ERROR(nic, COMGETTER(NATEngine)(engine.asOutParam()));
                 if (RTStrCmp(ValueUnion.psz, "default") == 0)
-                {
                     aliasMode = 0;
-                }
                 else
                 {
                     char *token = (char *)ValueUnion.psz;
-                    while(token)
+                    while (token)
                     {
-                        if (RTStrNCmp(token, "log", 3) == 0)
-                            aliasMode |= 0x1;
-                        else if (RTStrNCmp(token, "proxyonly", 9) == 0)
-                            aliasMode |= 0x2;
-                        else if (RTStrNCmp(token, "sameports", 9) == 0)
-                            aliasMode |= 0x4;
+                        if (RTStrNCmp(token, RT_STR_TUPLE("log")) == 0)
+                            aliasMode |= NATAliasMode_AliasLog;
+                        else if (RTStrNCmp(token, RT_STR_TUPLE("proxyonly")) == 0)
+                            aliasMode |= NATAliasMode_AliasProxyOnly;
+                        else if (RTStrNCmp(token, RT_STR_TUPLE("sameports")) == 0)
+                            aliasMode |= NATAliasMode_AliasUseSamePorts;
                         token = RTStrStr(token, ",");
                         if (token == NULL)
Index: /trunk/src/VBox/Frontends/VBoxManage/VBoxManageStorageController.cpp
===================================================================
--- /trunk/src/VBox/Frontends/VBoxManage/VBoxManageStorageController.cpp	(revision 51258)
+++ /trunk/src/VBox/Frontends/VBoxManage/VBoxManageStorageController.cpp	(revision 51259)
@@ -552,5 +552,5 @@
             // find the medium given
             /* host drive? */
-            if (!RTStrNICmp(pszMedium, "host:", 5))
+            if (!RTStrNICmp(pszMedium, RT_STR_TUPLE("host:")))
             {
                 ComPtr<IHost> host;