diff --git a/source/locs.c b/source/locs.c
index 183e352..65f7fcf 100644
--- a/source/locs.c
+++ b/source/locs.c
@@ -112,8 +112,13 @@ void locs_load(char *mapname)
 		loc[2] = strtol(t2, &t1, 0) * (1.0/8);
 		t1++;
 		t2 = strrchr(t1, '\n');
-		if (t2)
+		if (t2) {
 			t2[0] = '\0';
+			// handle dos format lines (COM_FOpenFile is binary only)
+			// and unix is effectively binary only anyway
+			if (t2 > t1 && t2[-1] == '\r')
+				t2[-1] = '\0';
+		}
 		locs_add(loc, t1);
 	}
 	Qclose(file);
diff --git a/source/teamplay.c b/source/teamplay.c
index bd317bc..29df22e 100644
--- a/source/teamplay.c
+++ b/source/teamplay.c
@@ -145,6 +145,11 @@ char *Team_ParseSay (char *s)
 				s += 2;
 			}
 			switch (chr) {
+				case '%':
+					t2[0] = '%';
+					t2[1] = 0;
+					t1 = t2;
+					break;
 				case 's':
 					bracket = 0;
 					t1 = skin->string;