diff --git a/polymer/eduke32/source/game.c b/polymer/eduke32/source/game.c
index 0895cae98..6bbf08166 100644
--- a/polymer/eduke32/source/game.c
+++ b/polymer/eduke32/source/game.c
@@ -8838,7 +8838,7 @@ void updatenames(void)
     if(ud.multimode > 1)
     {
         syncnames();
-        if(sprite[ps[myconnectindex].i].picnum == APLAYER)
+        if(sprite[ps[myconnectindex].i].picnum == APLAYER && sprite[ps[myconnectindex].i].pal != 1)
             sprite[ps[myconnectindex].i].pal = ud.pcolor[myconnectindex];
     }
     else
@@ -8852,7 +8852,7 @@ void updatenames(void)
         j = ps[myconnectindex].team;
         ud.pteam[myconnectindex] = ud.team;
 
-        if(sprite[ps[myconnectindex].i].picnum == APLAYER)
+        if(sprite[ps[myconnectindex].i].picnum == APLAYER && sprite[ps[myconnectindex].i].pal != 1)
             sprite[ps[myconnectindex].i].pal = ud.pcolor[myconnectindex];
     }
 }
@@ -10510,7 +10510,9 @@ char domovethings(void)
             ps[i].palookup = ud.pcolor[i] = j;
         }
 
-        sprite[ps[i].i].pal = ud.pcolor[i];
+
+		if(sprite[ps[i].i].pal != 1)
+	        sprite[ps[i].i].pal = ud.pcolor[i];
 
         cheatkeys(i);
 
diff --git a/polymer/eduke32/source/gameexec.c b/polymer/eduke32/source/gameexec.c
index 7c8efbbb2..7d24a1872 100644
--- a/polymer/eduke32/source/gameexec.c
+++ b/polymer/eduke32/source/gameexec.c
@@ -4326,7 +4326,7 @@ SKIPJIBS:
                 break;
             case CON_QSTRCPY:
                 if(fta_quotes[i] != NULL && fta_quotes[j] != NULL)
-                    Bstrcpy(fta_quotes[j],fta_quotes[i]);
+                    Bstrcpy(fta_quotes[i],fta_quotes[j]);
                 else OSD_Printf("%s %d null quote %d %d\n",__FILE__,__LINE__,i,j);
                 break;
             case CON_CHANGESPRITESTAT: