diff --git a/src/cpu/zero/vm/interpreterRT_zero.hpp b/src/cpu/zero/vm/interpreterRT_zero.hpp
index 692450210a5222da66928f1aa2feb93e4c10859f..5ff34d99bb58da163176b3f8a85642f240165927 100644
--- a/src/cpu/zero/vm/interpreterRT_zero.hpp
+++ b/src/cpu/zero/vm/interpreterRT_zero.hpp
@@ -92,15 +92,15 @@ class SignatureHandlerGenerator : public SignatureHandlerGeneratorBase {
 
  public:
   SignatureHandlerGenerator(methodHandle method, CodeBuffer* buffer)
-    : SignatureHandlerGeneratorBase(method, (ffi_cif *) buffer->code_end()),
+    : SignatureHandlerGeneratorBase(method, (ffi_cif *) buffer->insts_end()),
       _cb(buffer) {
-    _cb->set_code_end((address) (cif() + 1));
+    _cb->set_insts_end((address) (cif() + 1));
   }
 
  private:
   void push(intptr_t value) {
-    intptr_t *dst = (intptr_t *) _cb->code_end();
-    _cb->set_code_end((address) (dst + 1));
+    intptr_t *dst = (intptr_t *) _cb->insts_end();
+    _cb->set_insts_end((address) (dst + 1));
     *dst = value;
   }
 };
diff --git a/src/share/vm/code/nmethod.cpp b/src/share/vm/code/nmethod.cpp
index 9da564d277e0b69d71472b34bc41fd832727670f..f7a2b7ff0f08ee1ba0e616448a463a9154fd2f41 100644
--- a/src/share/vm/code/nmethod.cpp
+++ b/src/share/vm/code/nmethod.cpp
@@ -1421,7 +1421,7 @@ void nmethod::flush() {
   }
 
 #ifdef SHARK
-  ((SharkCompiler *) compiler())->free_compiled_method(instructions_begin());
+  ((SharkCompiler *) compiler())->free_compiled_method(insts_begin());
 #endif // SHARK
 
   ((CodeBlob*)(this))->flush();
diff --git a/src/share/vm/oops/methodOop.cpp b/src/share/vm/oops/methodOop.cpp
index 353a5f6762fab76863ac147bfe71c0f3c42febce..89a99c9877bc829c6637dfe15f6c3d7fc7211021 100644
--- a/src/share/vm/oops/methodOop.cpp
+++ b/src/share/vm/oops/methodOop.cpp
@@ -758,7 +758,7 @@ void methodOopDesc::set_code(methodHandle mh, nmethod *code) {
 
   OrderAccess::storestore();
 #ifdef SHARK
-  mh->_from_interpreted_entry = code->instructions_begin();
+  mh->_from_interpreted_entry = code->insts_begin();
 #else
   mh->_from_compiled_entry = code->verified_entry_point();
   OrderAccess::storestore();
diff --git a/src/share/vm/shark/sharkCompiler.hpp b/src/share/vm/shark/sharkCompiler.hpp
index ddac631527b73798d32e1601738768b503429d20..be47dd52916cd051b277002a3dc02476e34a231c 100644
--- a/src/share/vm/shark/sharkCompiler.hpp
+++ b/src/share/vm/shark/sharkCompiler.hpp
@@ -103,8 +103,7 @@ class SharkCompiler : public AbstractCompiler {
   // Global access
  public:
   static SharkCompiler* compiler() {
-    AbstractCompiler *compiler =
-      CompileBroker::compiler(CompLevel_fast_compile);
+    AbstractCompiler *compiler = CompileBroker::compiler(CompLevel_simple);
     assert(compiler->is_shark() && compiler->is_initialized(), "should be");
     return (SharkCompiler *) compiler;
   }