diff --git a/include/sys/types.h b/include/sys/types.h
index 034f30a8..368dd12f 100644
--- a/include/sys/types.h
+++ b/include/sys/types.h
@@ -32,7 +32,12 @@
 #endif
 
 #ifndef EOF
-#define EOF -1
+// FIXME M2_Planet chokes on -1, even inside #if ! __M2__
+#if __arm__ || __i386__
+#define EOF 0xffffffff
+#else
+#define EOF 0xffffffffffffffff
+#endif
 #endif
 
 #ifndef NULL
diff --git a/lib/linux/lseek.c b/lib/linux/lseek.c
index 34af9364..142d101f 100644
--- a/lib/linux/lseek.c
+++ b/lib/linux/lseek.c
@@ -27,10 +27,9 @@
 off_t
 lseek (int filedes, off_t offset, int whence)
 {
-  long long_filedes = filedes;
   long long_offset = offset;
   size_t skip = __buffered_read_clear (filedes);
   if (whence == SEEK_CUR)
     offset -= skip;
-  return _sys_call3 (SYS_lseek, long_filedes, long_offset, whence);
+  return _sys_call3 (SYS_lseek, filedes, long_offset, whence);
 }