diff --git a/ChangeLog b/ChangeLog
index bc669de..b642850 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+Version 2.03b:
+--------------
+
+  - Fixed a minor glitch in form parsing in analysis.c, courtesy of
+    Niloufar Pahlevan Sadegh.
+
+  - Two database.c bugfixes to wordlist handler, courtesy of Shaojie Wang.
+
 Version 2.02b:
 --------------
 
diff --git a/Makefile b/Makefile
index 005c852..c5f11a9 100644
--- a/Makefile
+++ b/Makefile
@@ -20,7 +20,7 @@
 #
 
 PROGNAME   = skipfish
-VERSION    = 2.02b
+VERSION    = 2.03b
 
 OBJFILES   = http_client.c database.c crawler.c analysis.c report.c
 INCFILES   = alloc-inl.h string-inl.h debug.h types.h http_client.h \
diff --git a/analysis.c b/analysis.c
index ee703f0..b60c5dd 100644
--- a/analysis.c
+++ b/analysis.c
@@ -758,8 +758,8 @@ void scrape_response(struct http_request* req, struct http_response* res) {
 
         /* Forms with no URL submit to current location. */
 
-        if (!dirty_url || !*dirty_url || !strcmp((char*)dirty_url, "\"\"") ||
-            !strcmp((char*)dirty_url, "''")) {
+        if (!dirty_url || !*dirty_url || !prefix(dirty_url, (char*)"\"\"") ||
+            !prefix(dirty_url, (char*)"''")) {
           dirty_url = serialize_path(req, 1, 0);
           delete_dirty = dirty_url;
         }
diff --git a/database.c b/database.c
index e70067a..de41b31 100644
--- a/database.c
+++ b/database.c
@@ -974,7 +974,7 @@ void wordlist_confirm_word(u8* text) {
 
   for (i=0;i<tlen;i++) {
     if (!isalnum(text[i]) && !strchr(" _-~().:!^$", text[i])) return;
-    if (isdigit(text[0])) dcnt++;
+    if (isdigit(text[i])) dcnt++;
     if (text[i] == '.') {
       if (ppos != -1) too_many_dots = 1;
       ppos = i;
@@ -1018,7 +1018,7 @@ void wordlist_confirm_word(u8* text) {
     /* Period only? Too long? */
     if (tlen == 1 || tlen - ppos > 12) return;
 
-    if (ppos && ppos != tlen - 1 && !isdigit(text[ppos] + 1)) {
+    if (ppos && ppos != tlen - 1 && !isdigit(text[ppos + 1])) {
       wordlist_confirm_single(text + ppos + 1, 1, KW_GEN_AUTO, 0, 1, 0, 0);
       text[ppos] = 0;
       wordlist_confirm_single(text, 0, KW_GEN_AUTO, 0, 1, 0, 0);