Index: include/versemgr.h
===================================================================
--- include/versemgr.h	(revision 2188)
+++ include/versemgr.h	(working copy)
@@ -86,7 +86,7 @@
 		friend class System;
 		friend struct BookOffsetLess;
 		class Private;
-		Private *p;
+        Private *p;
 
 		/** book name */
 		SWBuf longName;
Index: src/mgr/versemgr.cpp
===================================================================
--- src/mgr/versemgr.cpp	(revision 2188)
+++ src/mgr/versemgr.cpp	(working copy)
@@ -79,7 +79,10 @@
 };
 
 struct BookOffsetLess {
-	bool operator() (const VerseMgr::Book &o1, const long &o2) const { return o1.p->offsetPrecomputed[0] < o2; }
+    bool operator() (const VerseMgr::Book &o1, const VerseMgr::Book &o2) const { return o1.p->offsetPrecomputed[0] < o2.p->offsetPrecomputed[0]; }
+    bool operator() (const long &o1, const VerseMgr::Book &o2) const { return o1 < o2.p->offsetPrecomputed[0]; }
+    bool operator() (const VerseMgr::Book &o1, const long &o2) const { return o1.p->offsetPrecomputed[0] < o2; }
+    bool operator() (const long &o1, const long &o2) const { return o1 < o2; }
 };
 
 void VerseMgr::Book::init() {
@@ -103,7 +106,7 @@
 	ntStartOffset = other.ntStartOffset;
 }
 
-VerseMgr::System::System &VerseMgr::System::operator =(const System &other) {
+VerseMgr::System &VerseMgr::System::operator =(const System &other) {
 	name = other.name;
 	BMAX[0] = other.BMAX[0];
 	BMAX[1] = other.BMAX[1];
@@ -140,7 +143,7 @@
 		Book &b = p->books[p->books.size()-1];
 		p->osisLookup[b.getOSISName()] = p->books.size();
 		for (int i = 0; i < ot->chapmax; i++) {
-			b.p->verseMax.push_back(chMax[chap]);
+            b.p->verseMax.push_back(chMax[chap]);
 			offset++;		// chapter heading
 			b.p->offsetPrecomputed.push_back(offset);
 			offset += chMax[chap++];
@@ -181,7 +184,7 @@
 	(*p) = *(other.p);
 }
 
-VerseMgr::Book::Book& VerseMgr::Book::operator =(const Book &other) {
+VerseMgr::Book& VerseMgr::Book::operator =(const Book &other) {
 	longName = other.longName;
 	osisName = other.osisName;
 	prefAbbrev = other.prefAbbrev;
@@ -229,7 +232,7 @@
 
 char VerseMgr::System::getVerseFromOffset(long offset, int *book, int *chapter, int *verse) const {
 	// binary search for book
-	vector<Book>::iterator b = lower_bound(p->books.begin(), p->books.end(), offset, BookOffsetLess());
+    vector<Book>::iterator b = lower_bound(p->books.begin(), p->books.end(), offset, BookOffsetLess());
 	b--;
 	vector<long>::iterator c = lower_bound(b->p->offsetPrecomputed.begin(), b->p->offsetPrecomputed.end(), offset);
 	c--;