Index: src/main.c
===================================================================
--- src/main.c	(revision 1806)
+++ src/main.c	(working copy)
@@ -703,7 +703,7 @@
 {
 	unsigned long pagesize = sysconf(_SC_PAGE_SIZE);
 	DEBUG_1("SIGBUS %p", info->si_addr);
-	mmap((void *)(((unsigned long)info->si_addr / pagesize) * pagesize), pagesize, PROT_READ | PROT_WRITE, MAP_FIXED | MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);
+	mmap((void *)(((unsigned long)info->si_addr / pagesize) * pagesize), pagesize, PROT_READ | PROT_WRITE, MAP_FIXED | MAP_PRIVATE, -1, 0);
 }
 #endif
 
Index: src/exiv2.cc
===================================================================
--- src/exiv2.cc	(revision 1806)
+++ src/exiv2.cc	(working copy)
@@ -103,7 +103,7 @@
 
 static void debug_exception(Exiv2::AnyError& e)
 {
-	gchar *str = g_locale_from_utf8(e.what(), -1, NULL, NULL, NULL);
+	gchar *str = g_locale_from_utf8(e.what().c_str(), -1, NULL, NULL, NULL);
 	DEBUG_1("Exiv2: %s", str);
 	g_free(str);
 }