diff --git a/perl-xCAT/xCAT/Table.pm b/perl-xCAT/xCAT/Table.pm
index a277ac21b..8b3a6f188 100644
--- a/perl-xCAT/xCAT/Table.pm
+++ b/perl-xCAT/xCAT/Table.pm
@@ -1601,7 +1601,7 @@ sub setNodesAttribs {
             foreach my $col (@orderedcols) { #try aggregating requests.  Could also see about single prepare, multiple executes instead
                 $upstring .= "$col = ?, ";
             }
-            $upstring =~ s/, / where $nodekey = ?/;
+            $upstring =~ s/, $/ where $nodekey = ?/;
             $upsth = $self->{dbh}->prepare($upstring);
         }
         if (scalar keys %updatenodes) {
diff --git a/xCAT-server/lib/xcat/plugins/anaconda.pm b/xCAT-server/lib/xcat/plugins/anaconda.pm
index dfaf77835..1707e965b 100644
--- a/xCAT-server/lib/xcat/plugins/anaconda.pm
+++ b/xCAT-server/lib/xcat/plugins/anaconda.pm
@@ -878,6 +878,13 @@ sub copycd
             $distname = "rhels5";
         }
     }
+    elsif ($desc =~ /^Red Hat Enterprise Linux 6\.0$/)
+    {
+        unless ($distname)
+        {
+            $distname = "rhel6";
+        }
+    }
 
     unless ($distname)
     {