diff --git a/makefile b/makefile
index 726f04a233..558276fee9 100755
--- a/makefile
+++ b/makefile
@@ -1295,7 +1295,6 @@ ifeq ($(process),compile)
 
 	vm-asm-sources += $(src)/compile-$(arch).$(asm-format)
 endif
-cflags += -DAVIAN_PROCESS_$(process)
 ifeq ($(aot-only),true)
 	cflags += -DAVIAN_AOT_ONLY
 endif
diff --git a/src/classpath-openjdk.cpp b/src/classpath-openjdk.cpp
index 8814018370..10a3f89204 100644
--- a/src/classpath-openjdk.cpp
+++ b/src/classpath-openjdk.cpp
@@ -993,7 +993,7 @@ int64_t JNICALL
         return Exists | Directory;
       }
 
-      unsigned length;
+      size_t length;
       System::FileType type = finder->stat(ef.path, &length, true);
       switch (type) {
       case System::TypeUnknown:
@@ -1052,7 +1052,7 @@ int64_t JNICALL
         return mask == Read;
       }
 
-      unsigned length;
+      size_t length;
       System::FileType type = finder->stat(ef.path, &length, true);
       switch (type) {
       case System::TypeDoesNotExist:
@@ -1106,7 +1106,7 @@ int64_t JNICALL getFileLength(Thread* t, GcMethod* method, uintptr_t* arguments)
         return 0;
       }
 
-      unsigned fileLength;
+      size_t fileLength;
       finder->stat(ef.path, &fileLength);
       return fileLength;
     }