diff --git a/CMakeLists.txt b/CMakeLists.txt
index 91305e1..508930c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -66,9 +66,13 @@ include_directories(
 if (NOT WIN32)
 	include_directories(
 		${X11_INCLUDE_DIR}
-		${CHECK_INCLUDE_DIR}
 		)
 endif (NOT WIN32)
+if (CHECK_FOUND)
+	include_directories(
+		${CHECK_INCLUDE_DIR}
+		)
+endif(CHECK_FOUND)
 
 if (NOT WIN32)
 	add_definitions(-std=gnu11
diff --git a/src/db.c b/src/db.c
index 9d7dd82..a113a62 100644
--- a/src/db.c
+++ b/src/db.c
@@ -9,7 +9,7 @@ db_open(const char *file, sqlite3 **db)
 
 	int result = sqlite3_open(file, db);
 	if (result) {
-		error("Failed to open db: %s", sqlite3_errmsg(db));
+		error("Failed to open db: %s", sqlite3_errmsg(*db));
 	}
 	return result == 0;
 }
@@ -34,7 +34,7 @@ db_execute_stmnt(const char *stmnt,
 
 void db_close(sqlite3 **db)
 {
-	char *fname = sqlite3_db_filename(*db, NULL);
+	const char *fname = sqlite3_db_filename(*db, NULL);
 	debug("Closing db: %s", fname);
 	sqlite3_close(*db);
 	*db = NULL;