diff --git a/classpath/java/lang/reflect/Method.java b/classpath/java/lang/reflect/Method.java
index 090401b91d..051309c05c 100644
--- a/classpath/java/lang/reflect/Method.java
+++ b/classpath/java/lang/reflect/Method.java
@@ -11,7 +11,7 @@ public class Method<T> extends AccessibleObject implements Member {
   private byte[] spec;
   private Class<T> class_;
   private Object code;
-  private long compiled;
+  private Object compiled;
 
   private Method() { }
 
diff --git a/src/type-generator.cpp b/src/type-generator.cpp
index d840ff5f7b..8835184610 100644
--- a/src/type-generator.cpp
+++ b/src/type-generator.cpp
@@ -786,9 +786,9 @@ namesPointer(const char* s)
 unsigned
 sizeOf(const char* type, Object* declarations)
 {
-  if (equal(type, "object")) {
-    return BytesPerWord;
-  } else if (equal(type, "intptr_t")) {
+  if (equal(type, "object")
+      or equal(type, "intptr_t") or equal(type, "uintptr_t"))
+  {
     return BytesPerWord;
   } else if (equal(type, "unsigned") or equal(type, "int")) {
     return sizeof(int);
diff --git a/src/types.def b/src/types.def
index 322c0ac92a..2e9d7c451a 100644
--- a/src/types.def
+++ b/src/types.def
@@ -17,6 +17,9 @@
   (object staticTable)
   (object loader))
 
+(type singleton
+  (array uintptr_t body))
+
 (type classLoader java/lang/ClassLoader
   (extends jobject)
   (object parent))
@@ -60,7 +63,7 @@
   (object spec)
   (object class)
   (object code)
-  (uint64_t compiled))
+  (object compiled))
 
 (type nativeMethodData
   (void* function)