diff --git a/Makefile b/Makefile
index 9c218500a..22666c5d6 100644
--- a/Makefile
+++ b/Makefile
@@ -197,7 +197,7 @@ $(LUALIB):
 ifdef EMULATE_READER
 	make -C $(LUADIR)
 else
-	make -C $(LUADIR) HOST_CC="$(HOSTCC) -m32" CROSS="$(HOST)-" TARGET_FLAGS="$(SYSROOT) -DLUAJIT_NO_LOG2 -DLUAJIT_NO_EXP2"
+	make -C $(LUADIR) CC="$(HOSTCC)" HOST_CC="$(HOSTCC) -m32" CROSS="$(HOST)-" TARGET_FLAGS="$(SYSROOT) -DLUAJIT_NO_LOG2 -DLUAJIT_NO_EXP2"
 endif
 
 thirdparty: $(MUPDFLIBS) $(THIRDPARTYLIBS) $(LUALIB) $(DJVULIBS) $(CRENGINELIBS)
diff --git a/crereader.lua b/crereader.lua
index 213997dc4..56afb136e 100644
--- a/crereader.lua
+++ b/crereader.lua
@@ -287,14 +287,16 @@ end
 function CREReader:prevBookMarkedPage()
 	local pre_item = nil
 	for k,v in ipairs(self.bookmarks) do
-		if self.pos <= self.doc:getPosFromXPointer(v) then
-			if self.doc:getPosFromXPointer(pre_item) < self.pos then
+		if self.pos <= self.doc:getPosFromXPointer(v.page) then
+			if not pre_item then
+				break
+			elseif self.doc:getPosFromXPointer(pre_item.page) < self.pos then
 				return pre_item
 			end
 		end
 		pre_item = v
 	end
-	return nil
+	return pre_item
 end
 
 function CREReader:showBookMarks()
@@ -407,8 +409,8 @@ function CREReader:adjustCreReaderCommands()
 			local delta = 1
 			local change = "increase"
 			if keydef.keycode == KEY_PGBCK or keydef.keycode == KEY_LPGBCK then
-				delta = -1
-				change = "decrease"
+			   delta = -1
+			   change = "decrease"
 			end
 			self.font_zoom = self.font_zoom + delta
 			InfoMessage:show(change.." font size to "..self.font_zoom, 0)
diff --git a/unireader.lua b/unireader.lua
index f730ab3e4..b041336cd 100644
--- a/unireader.lua
+++ b/unireader.lua
@@ -1750,13 +1750,15 @@ function UniReader:prevBookMarkedPage()
 	local pre_item = nil
 	for k,v in ipairs(self.bookmarks) do
 		if self.pageno <= v.page then
-			if pre_item.page < self.pageno then
+			if not pre_item then
+				break
+			elseif pre_item.page < self.pageno then
 				return pre_item
 			end
 		end
 		pre_item = v
 	end
-	return nil
+	return pre_item
 end
 
 function UniReader:showHighLight()
@@ -1929,7 +1931,7 @@ function UniReader:addAllCommands()
 		function(unireader,keydef)
 			is_zoom_out = (keydef.keycode == KEY_PGBCK or keydef.keycode == KEY_LPGBCK)
 			unireader:setGlobalZoom(unireader.globalzoom_orig
-				+ ( is_zoom_out and -1 or 1)*unireader.globalzoom_orig*0.2)
+			   + ( is_zoom_out and -1 or 1)*unireader.globalzoom_orig*0.2)
 		end)
 	self.commands:add(KEY_BACK,nil,"Back",
 		"go backward in jump history",