diff --git a/perl-xCAT/xCAT/VMCommon.pm b/perl-xCAT/xCAT/VMCommon.pm
index e146fd16b..ed6d9a5dc 100644
--- a/perl-xCAT/xCAT/VMCommon.pm
+++ b/perl-xCAT/xCAT/VMCommon.pm
@@ -204,7 +204,7 @@ sub getMacAddresses {
         if (not $macdata) {
             $macdata = $macaddr;
         } else {
-            $macdata .= "|".$macaddr."*NOIP*";
+            $macdata .= "|".$macaddr."!*NOIP*";
         }
         push @macs,$macaddr;
     }
diff --git a/xCAT-server/lib/xcat/plugins/esx.pm b/xCAT-server/lib/xcat/plugins/esx.pm
index 3a4f6b04d..2dd68d095 100644
--- a/xCAT-server/lib/xcat/plugins/esx.pm
+++ b/xCAT-server/lib/xcat/plugins/esx.pm
@@ -3573,7 +3573,7 @@ sub refreshclusterdatastoremap {
                 my $name = $dsv->info->vmfs->name;
                 $clusterhash{$cluster}->{datastoremap}->{"vmfs://".$name} = $dsv->info->name;     
 				$clusterhash{$cluster}->{datastoreurlmap}->{$dsv->info->name} = "vmfs://".$name;
-                $clusterhash{$cluster}->{datasotrerefmap}->{"vmfs://".$name} = $_;
+                $clusterhash{$cluster}->{datastorerefmap}->{"vmfs://".$name} = $_;
             }
         }
     }