diff --git a/src/miscfileformats.c b/src/miscfileformats.c
index d9f8a48a..114f4292 100644
--- a/src/miscfileformats.c
+++ b/src/miscfileformats.c
@@ -3436,9 +3436,9 @@ void Test_PPH(T_IO_Context * context)
 {
   FILE *file;
   byte buffer[6];
-  long file_size;
+  unsigned long file_size;
   unsigned int w, h;
-  int expected;
+  unsigned int expected;
 
   File_error = 1;
 
diff --git a/src/readline.c b/src/readline.c
index 0927c64b..654be3e2 100644
--- a/src/readline.c
+++ b/src/readline.c
@@ -405,6 +405,8 @@ bye:
   return haiku_get_clipboard();
   #else
   // Not implemented (no standard) on Linux systems. Maybe someday...
+  if (unicode)
+    *unicode = NULL;
   return NULL;
   #endif
 }