diff --git a/runtime/gc/collector_type.h b/runtime/gc/collector_type.h
index 9c62097..9275e6d 100644
--- a/runtime/gc/collector_type.h
+++ b/runtime/gc/collector_type.h
@@ -54,7 +54,7 @@
 #elif ART_DEFAULT_GC_TYPE_IS_GSS
     kCollectorTypeGSS
 #else
-    gc::kCollectorTypeCMS
+    kCollectorTypeCMS
 #error "ART default GC type must be set"
 #endif
     ;  // NOLINT [whitespace/semicolon] [5]
diff --git a/runtime/parsed_options_test.cc b/runtime/parsed_options_test.cc
index f68b632..79dc2fa 100644
--- a/runtime/parsed_options_test.cc
+++ b/runtime/parsed_options_test.cc
@@ -22,7 +22,12 @@
 
 namespace art {
 
-class ParsedOptionsTest : public ::testing::Test {};
+class ParsedOptionsTest : public ::testing::Test {
+ public:
+  static void SetUpTestCase() {
+    CommonRuntimeTest::SetUpAndroidRoot();
+  }
+};
 
 TEST_F(ParsedOptionsTest, ParsedOptions) {
   void* test_vfprintf = reinterpret_cast<void*>(0xa);
diff --git a/runtime/runtime.cc b/runtime/runtime.cc
index 4bb1741..549ef0e 100644
--- a/runtime/runtime.cc
+++ b/runtime/runtime.cc
@@ -762,7 +762,7 @@
 
   verify_ = runtime_options.GetOrDefault(Opt::Verify);
 
-  if (runtime_options.Exists(Opt::Interpret)) {
+  if (runtime_options.GetOrDefault(Opt::Interpret)) {
     GetInstrumentation()->ForceInterpretOnly();
   }