diff --git a/src/Makefile b/src/Makefile
index f4524d28..005e847c 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -264,7 +264,7 @@ endif
       LUACOPT = -D__ENABLE_LUA__ $(shell pkg-config $(LUAPKG) --cflags)
       LUALOPT = $(shell pkg-config $(LUAPKG) --libs)
     endif
-    COPT = -W -Wall -Werror -g $(shell sdl-config --cflags) $(TTFCOPT) -I/boot/common/include $(LUACOPT)
+    COPT = -W -Wall -g $(shell sdl-config --cflags) $(TTFCOPT) -I/boot/common/include $(LUACOPT)
     COPT += -DENABLE_FILENAMES_ICONV
     LOPT = $(shell sdl-config --libs) -lSDL_image -lpng -ljpeg -lz $(TTFLOPT) -lfreetype -lbe $(LUALOPT) -liconv
     CC = gcc
diff --git a/src/readline.c b/src/readline.c
index d13825c0..54e82e23 100644
--- a/src/readline.c
+++ b/src/readline.c
@@ -402,6 +402,8 @@ bye:
     return dst;
 
   #elif defined __HAIKU__
+  if (unicode)
+    *unicode = NULL;
   return haiku_get_clipboard();
   #else
   // Not implemented (no standard) on Linux systems. Maybe someday...
diff --git a/tools/gifanalyzer/gifanalyzer.c b/tools/gifanalyzer/gifanalyzer.c
index 096ff6c4..aa0494cf 100644
--- a/tools/gifanalyzer/gifanalyzer.c
+++ b/tools/gifanalyzer/gifanalyzer.c
@@ -33,6 +33,8 @@ int main(int argc, char* argv[])
   FILE* theFile;
   uint8_t buffer[8];
   uint16_t w,h;
+  int colors;
+  int color_table_size;
 
   if(argc < 2)
   {
@@ -59,8 +61,8 @@ int main(int argc, char* argv[])
 
   fread(buffer,1,3,theFile);
 
-  int colors = 1 << (((buffer[0] & 0x70)>>4)+1); // 0x70 == 0b01110000
-  int color_table_size = 1 << ((buffer[0]&0x7)+1);
+  colors = 1 << (((buffer[0] & 0x70)>>4)+1); // 0x70 == 0b01110000
+  color_table_size = 1 << ((buffer[0]&0x7)+1);
 
   printf("Color palette: 0x%02x\n",buffer[0]&0xFF);
   if (buffer[0] & 0x80) { // 0x80 == 0b10000000
@@ -100,7 +102,8 @@ int main(int argc, char* argv[])
   }
 
   printf("offset : %lu\n", ftell(theFile));
-	fclose(theFile);
+  fclose(theFile);
+
   return 0;
 }