diff --git a/classpath/java/util/Properties.java b/classpath/java/util/Properties.java
index 310665567f..c591eb714b 100644
--- a/classpath/java/util/Properties.java
+++ b/classpath/java/util/Properties.java
@@ -45,8 +45,8 @@ public class Properties extends Hashtable {
     return value;
   }
 
-  public void setProperty(String key, String value) {
-    put(key, value);
+  public Object setProperty(String key, String value) {
+    return put(key, value);
   }
 
   private static class Parser {
diff --git a/src/builtin.cpp b/src/builtin.cpp
index 3d1cd8c283..0665a40be2 100644
--- a/src/builtin.cpp
+++ b/src/builtin.cpp
@@ -1150,7 +1150,7 @@ Avian_java_lang_Runtime_exit
 {
   shutDown(t);
 
-  t->m->system->exit(*arguments);
+  t->m->system->exit(arguments[1]);
 }
 
 extern "C" JNIEXPORT int64_t JNICALL
diff --git a/src/machine.cpp b/src/machine.cpp
index 48bfc6f8de..1886715942 100644
--- a/src/machine.cpp
+++ b/src/machine.cpp
@@ -1818,6 +1818,7 @@ makeArrayClass(Thread* t, object loader, unsigned dimensions, object spec,
 object
 makeArrayClass(Thread* t, object loader, object spec)
 {
+  PROTECT(t, loader);
   PROTECT(t, spec);
 
   const char* s = reinterpret_cast<const char*>(&byteArrayBody(t, spec, 0));
@@ -3752,8 +3753,6 @@ runJavaThread(Thread* t)
 void
 runFinalizeThread(Thread* t)
 {
-  fprintf(stderr, "run finalize thread\n");
-
   setDaemon(t, t->javaThread, true);
 
   object list = 0;
@@ -3768,8 +3767,6 @@ runFinalizeThread(Thread* t)
       }
 
       if (t->m->finalizeThread == 0) {
-        fprintf(stderr, "exit finalize thread\n");
-
         return;
       } else {
         list = t->m->objectsToFinalize;