diff --git a/README.md b/README.md
index 78515e4eb0..1f13d9ea25 100644
--- a/README.md
+++ b/README.md
@@ -710,7 +710,7 @@ using the OpenJDK library.)
 
 __6.__ Build the boot and code images.
 
-     $ ../build/linux-i386-bootimage/bootimage-generator
+     $ ../build/linux-i386-bootimage/bootimage-generator \
         -cp stage2 \
         -bootimage bootimage-bin.o \
         -codeimage codeimage-bin.o
diff --git a/makefile b/makefile
index 2a763ecb71..e4994a63cf 100755
--- a/makefile
+++ b/makefile
@@ -1479,11 +1479,11 @@ test-args = $(test-flags) $(input)
 ifneq ($(supports_avian_executable),false)
 build: $(static-library) $(executable) $(dynamic-library) $(lzma-loader) \
 	$(lzma-encoder) $(executable-dynamic) $(classpath-dep) $(test-dep) \
-	$(test-extra-dep) $(embed)
+	$(test-extra-dep) $(embed) $(build)/classpath.jar
 else
 build: $(static-library) $(dynamic-library) $(lzma-loader) \
 	$(lzma-encoder) $(classpath-dep) $(test-dep) \
-	$(test-extra-dep) $(embed)
+	$(test-extra-dep) $(embed) $(build)/classpath.jar
 endif
 
 $(test-dep): $(classpath-dep)
diff --git a/src/avian/lzma-util.h b/src/avian/lzma-util.h
index bb60d2ba25..09d54e2359 100644
--- a/src/avian/lzma-util.h
+++ b/src/avian/lzma-util.h
@@ -22,14 +22,14 @@ const unsigned Padding = 16;
 
 class LzmaAllocator {
  public:
-  LzmaAllocator(avian::util::Allocator* a) : a(a)
+  LzmaAllocator(avian::util::Alloc* a) : a(a)
   {
     allocator.Alloc = allocate;
     allocator.Free = free;
   }
 
   ISzAlloc allocator;
-  avian::util::Allocator* a;
+  avian::util::Alloc* a;
 
   static void* allocate(void* allocator, size_t size)
   {
diff --git a/src/avian/lzma.h b/src/avian/lzma.h
index 7d6ec23ec7..376ac88d34 100644
--- a/src/avian/lzma.h
+++ b/src/avian/lzma.h
@@ -22,13 +22,13 @@ class AllocOnly;
 namespace vm {
 
 uint8_t* decodeLZMA(System* s,
-                    avian::util::AllocOnly* a,
+                    avian::util::Alloc* a,
                     uint8_t* in,
                     unsigned inSize,
                     unsigned* outSize);
 
 uint8_t* encodeLZMA(System* s,
-                    avian::util::AllocOnly* a,
+                    avian::util::Alloc* a,
                     uint8_t* in,
                     unsigned inSize,
                     unsigned* outSize);
diff --git a/src/lzma-decode.cpp b/src/lzma-decode.cpp
index 0630eda03d..a172743e55 100644
--- a/src/lzma-decode.cpp
+++ b/src/lzma-decode.cpp
@@ -27,7 +27,7 @@ int32_t read4(const uint8_t* in)
 namespace vm {
 
 uint8_t* decodeLZMA(System* s,
-                    avian::util::AllocOnly* a,
+                    avian::util::Alloc* a,
                     uint8_t* in,
                     unsigned inSize,
                     unsigned* outSize)
diff --git a/src/lzma-encode.cpp b/src/lzma-encode.cpp
index cfaf3f3512..03fe4af288 100644
--- a/src/lzma-encode.cpp
+++ b/src/lzma-encode.cpp
@@ -25,7 +25,7 @@ SRes myProgress(void*, UInt64, UInt64)
 namespace vm {
 
 uint8_t* encodeLZMA(System* s,
-                    AllocOnly* a,
+                    avian::util::Alloc* a,
                     uint8_t* in,
                     unsigned inSize,
                     unsigned* outSize)