--- old/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.debug/src/org/graalvm/compiler/debug/internal/method/MethodMetricsImpl.java	2017-03-20 17:37:55.000000000 -0700
+++ new/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.debug/src/org/graalvm/compiler/debug/internal/method/MethodMetricsImpl.java	2017-03-20 17:37:55.000000000 -0700
@@ -201,7 +201,7 @@
         if (threadCache == null) {
             // this branch will only be executed once for each compiler thread on the first request
             // of a method metric
-            threadCache = new HashMap<>(GraalDebugConfig.Options.MethodFilter.getValue() == null ? 128 : 16);
+            threadCache = new HashMap<>(GraalDebugConfig.Options.MethodFilter.getValue(DebugScope.getConfig().getOptions()) == null ? 128 : 16);
             threadEntries.set(threadCache);
             addThreadCompilationData(threadCache);
         }
@@ -334,7 +334,7 @@
             Set<ResolvedJavaMethod> methods = new HashSet<>();
 
             // gather all methods we found
-            threadMaps.stream().forEach(x -> {
+            threadMaps.forEach(x -> {
                 // snapshot the current compilations to only capture all methods compiled until now
                 HashMap<ResolvedJavaMethod, CompilationData> snapShot = new HashMap<>(x);
                 snapShot.keySet().forEach(y -> methods.add(y));