diff --git a/src/query/xadump.cpp b/src/query/xadump.cpp
index 1b03b33a..eec084e9 100644
--- a/src/query/xadump.cpp
+++ b/src/query/xadump.cpp
@@ -1,5 +1,5 @@
 #ifndef lint
-static char rcsid[] = "@(#$Id: xadump.cpp,v 1.18 2008-07-01 11:51:51 dockes Exp $ (C) 2004 J.F.Dockes";
+static char rcsid[] = "@(#$Id: xadump.cpp,v 1.19 2008-12-15 14:39:52 dockes Exp $ (C) 2004 J.F.Dockes";
 #endif
 /*
  *   This program is free software; you can redistribute it and/or modify
@@ -17,6 +17,7 @@ static char rcsid[] = "@(#$Id: xadump.cpp,v 1.18 2008-07-01 11:51:51 dockes Exp
  *   Free Software Foundation, Inc.,
  *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
  */
+#include <stdlib.h>
 #include <signal.h>
 #include <strings.h>
 
@@ -207,7 +208,7 @@ int main(int argc, char **argv)
 	    cout << "Really delete xapian document ?" << endl;
 	    string rep;
 	    cin >> rep;
-	    if (!rep.empty() && rep[0] == 'y' || rep[0] == 'Y') {
+	    if (!rep.empty() && (rep[0] == 'y' || rep[0] == 'Y')) {
 		Xapian::WritableDatabase wdb(dbdir,  Xapian::DB_OPEN);
 		cout << "Deleting" << endl;
 		wdb.delete_document(docid);
diff --git a/src/rcldb/searchdata.cpp b/src/rcldb/searchdata.cpp
index b1090158..ca74f063 100644
--- a/src/rcldb/searchdata.cpp
+++ b/src/rcldb/searchdata.cpp
@@ -1,5 +1,5 @@
 #ifndef lint
-static char rcsid[] = "@(#$Id: searchdata.cpp,v 1.28 2008-12-15 09:24:24 dockes Exp $ (C) 2006 J.F.Dockes";
+static char rcsid[] = "@(#$Id: searchdata.cpp,v 1.29 2008-12-15 14:39:52 dockes Exp $ (C) 2006 J.F.Dockes";
 #endif
 /*
  *   This program is free software; you can redistribute it and/or modify
@@ -234,9 +234,9 @@ private:
     // After splitting entry on whitespace: process non-phrase element
     void processSimpleSpan(const string& span, list<Xapian::Query> &pqueries);
     // Process phrase/near element
-    void StringToXapianQ::processPhraseOrNear(wsQData *splitData, 
-					      list<Xapian::Query> &pqueries,
-					      bool useNear, int slack);
+    void processPhraseOrNear(wsQData *splitData, 
+			     list<Xapian::Query> &pqueries,
+			     bool useNear, int slack);
 
     Db&           m_db;
     const string& m_prefix;