diff --git a/inotify.c b/inotify.c
index 51ab35f..13074fc 100644
--- a/inotify.c
+++ b/inotify.c
@@ -510,9 +510,9 @@ int
 inotify_remove_file(const char * path)
 {
 	char * sql;
-	char **result;
 	char * art_cache;
 	char * ptr;
+	char **result;
 	sqlite_int64 detailID;
 	int rows, playlist;
 
@@ -528,9 +528,9 @@ inotify_remove_file(const char * path)
 	{
 		sql_exec(db, "DELETE from PLAYLISTS where ID = %lld", detailID);
 		sql_exec(db, "DELETE from DETAILS where ID ="
-		             " (SELECT DETAIL_ID from OBJECTS where OBJECT_ID = '%s$%lld')",
+		             " (SELECT DETAIL_ID from OBJECTS where OBJECT_ID = '%s$%llX')",
 		         MUSIC_PLIST_ID, detailID);
-		sql_exec(db, "DELETE from OBJECTS where OBJECT_ID = '%s$%lld' or PARENT_ID = '%s$%lld'",
+		sql_exec(db, "DELETE from OBJECTS where OBJECT_ID = '%s$%llX' or PARENT_ID = '%s$%llX'",
 		         MUSIC_PLIST_ID, detailID, MUSIC_PLIST_ID, detailID);
 	}
 	else
diff --git a/playlist.c b/playlist.c
index fadd4e3..a82b9c9 100644
--- a/playlist.c
+++ b/playlist.c
@@ -95,7 +95,7 @@ fill_playlists()
 	struct stat file;
 	char type[4];
 	sqlite_int64 plID, detailID;
-	char sql_buf[1024] = "SELECT ID, NAME, PATH from PLAYLISTS where ITEMS > FOUND";
+	char sql_buf[] = "SELECT ID, NAME, PATH from PLAYLISTS where ITEMS > FOUND";
 
 	if( sql_get_table(db, sql_buf, &result, &rows, NULL) != SQLITE_OK ) 
 		return -1;