diff --git a/classpath/avian/Assembler.java b/classpath/avian/Assembler.java
index 57cd605da8..3e1eae271b 100644
--- a/classpath/avian/Assembler.java
+++ b/classpath/avian/Assembler.java
@@ -74,7 +74,7 @@ public class Assembler {
       e.writeTo(out);
     }
 
-    write2(out, 0); // flags
+    write2(out, ACC_PUBLIC); // flags
     write2(out, name + 1);
     write2(out, super_ + 1);
     
diff --git a/makefile b/makefile
index 8a40669a95..811a14ceb4 100644
--- a/makefile
+++ b/makefile
@@ -86,11 +86,9 @@ ifneq ($(openjdk),)
 		openjdk-jar-dep = $(build)/openjdk-jar.dep
 		classpath-jar-dep = $(openjdk-jar-dep)
 		javahome = $(embed-prefix)/javahomeJar
-		javahome-files = lib/zi
+		javahome-files = lib/zi lib/currency.data
 		ifeq ($(platform),windows)
 			javahome-files += lib/tzmappings
-		else
-			javahome-files += lib/currency.data
 		endif
 		javahome-object = $(build)/javahome-jar.o
 		boot-javahome-object = $(build)/boot-javahome.o
@@ -514,17 +512,23 @@ dynamic-library = $(build)/$(so-prefix)jvm$(so-suffix)
 executable-dynamic = $(build)/$(name)-dynamic${exe-suffix}
 
 ifneq ($(classpath),avian)
+# Assembler, ConstantPool, and Stream are not technically needed for a
+# working build, but we include them since our Subroutine test uses
+# them to synthesize a class:
 	classpath-sources := \
-		$(classpath-src)/avian/Continuations.java \
+		$(classpath-src)/avian/Addendum.java \
+		$(classpath-src)/avian/Assembler.java \
 		$(classpath-src)/avian/Callback.java \
 		$(classpath-src)/avian/CallbackReceiver.java \
-		$(classpath-src)/avian/IncompatibleContinuationException.java \
-		$(classpath-src)/avian/SystemClassLoader.java \
-		$(classpath-src)/avian/Machine.java \
-		$(classpath-src)/avian/Addendum.java \
 		$(classpath-src)/avian/ClassAddendum.java \
-		$(classpath-src)/avian/MethodAddendum.java \
+		$(classpath-src)/avian/ConstantPool.java \
+		$(classpath-src)/avian/Continuations.java \
 		$(classpath-src)/avian/FieldAddendum.java \
+		$(classpath-src)/avian/IncompatibleContinuationException.java \
+		$(classpath-src)/avian/Machine.java \
+		$(classpath-src)/avian/MethodAddendum.java \
+		$(classpath-src)/avian/Stream.java \
+		$(classpath-src)/avian/SystemClassLoader.java \
 		$(classpath-src)/avian/VMClass.java \
 		$(classpath-src)/avian/VMField.java \
 		$(classpath-src)/avian/VMMethod.java \