diff --git a/src/common/spells/combatspells.c b/src/common/spells/combatspells.c
index 5fd07b276..54cece117 100644
--- a/src/common/spells/combatspells.c
+++ b/src/common/spells/combatspells.c
@@ -477,7 +477,7 @@ random_skill(unit *u, boolean weighted)
   for (sv = u->skills; sv != u->skills + u->skill_size; ++sv) {
     if (sv->level>0) {
       if (weighted) {
-        if (n<sv->level) return sv->id;
+        if (n<(int)sv->level) return sv->id;
         n-=sv->level;
       } else {
         if (n == 0) return sv->id;
diff --git a/src/common/util/parser.c b/src/common/util/parser.c
index fa1a356f0..627cc030f 100644
--- a/src/common/util/parser.c
+++ b/src/common/util/parser.c
@@ -151,6 +151,7 @@ parse_token(const char ** str)
     }
     if (escape) {
       copy = true;
+      escape = false;
     } else if (iswspace(ucs)) {
       if (quotechar==0) break;
       copy = true;