diff --git a/CMakeLists.txt b/CMakeLists.txt
index d6976634..0c0c9097 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -16,8 +16,8 @@ if(VISIBILITY_HIDDEN)
   add_definitions (-fvisibility=hidden)
 endif()
 
-option(BUILD_TESTS "Build the test suite"  ON)
-option(BUILD_EXAMPLES "Build the examples"  ON)
+option(BUILD_TESTS "Build the test suite"  OFF)
+option(BUILD_EXAMPLES "Build the examples"  OFF)
 
 option(NO_ITUNES_HACKS "Disable workarounds for iTunes bugs"  OFF)
 
diff --git a/taglib/ape/apefile.cpp b/taglib/ape/apefile.cpp
index c66b55a2..44f459e9 100644
--- a/taglib/ape/apefile.cpp
+++ b/taglib/ape/apefile.cpp
@@ -134,7 +134,7 @@ PropertyMap APE::File::setProperties(const PropertyMap &properties)
   else if(d->hasID3v1)
     return d->tag.access<ID3v1::Tag>(ID3v1Index, false)->setProperties(properties);
   else
-    return d->tag.access<APE::Tag>(APE, true)->setProperties(properties);
+    return d->tag.access<APE::Tag>(APEIndex, true)->setProperties(properties);
 }
 
 APE::Properties *APE::File::audioProperties() const