diff --git a/src/org/intellij/erlang/hierarchy/ErlangCallHierarchyProvider.java b/src/org/intellij/erlang/hierarchy/ErlangCallHierarchyProvider.java
index 6f6590657..85a330c2a 100644
--- a/src/org/intellij/erlang/hierarchy/ErlangCallHierarchyProvider.java
+++ b/src/org/intellij/erlang/hierarchy/ErlangCallHierarchyProvider.java
@@ -102,7 +102,7 @@ protected HierarchyTreeStructure createHierarchyTreeStructure(@NotNull String ty
     @Override
     protected Comparator<NodeDescriptor<?>> getComparator() {
       HierarchyBrowserManager.State state = HierarchyBrowserManager.getInstance(myProject).getState();
-      return state != null && state.SORT_ALPHABETICALLY ? AlphaComparator.INSTANCE : SourceComparator.INSTANCE;
+      return state != null && state.SORT_ALPHABETICALLY ? AlphaComparator.getInstance() : SourceComparator.INSTANCE;
     }
   }
 }
diff --git a/src/org/intellij/erlang/navigation/ErlangGotoSuperHandler.java b/src/org/intellij/erlang/navigation/ErlangGotoSuperHandler.java
index 1f7bfcb69..0dfc8111a 100644
--- a/src/org/intellij/erlang/navigation/ErlangGotoSuperHandler.java
+++ b/src/org/intellij/erlang/navigation/ErlangGotoSuperHandler.java
@@ -52,7 +52,7 @@ public void invoke(@NotNull Project project, @NotNull Editor editor, @NotNull Ps
     List<ErlangCallbackSpec> callbackSpecs = ErlangNavigationUtil.getCallbackSpecs(function);
     String presentation = ErlangPsiImplUtil.createFunctionPresentation(function);
 
-    PsiElementListNavigator.openTargets(editor, getNavigatables(presentation, callbackSpecs), "Go to callback specification", presentation, new DefaultPsiElementCellRenderer());
+    PsiElementListNavigator.openTargets(editor, getNavigatables(presentation, callbackSpecs), "Go to Callback Specification", presentation, new DefaultPsiElementCellRenderer(), null);
   }
 
   @Override
@@ -67,6 +67,6 @@ private static NavigatablePsiElement[] getNavigatables(String targetPresentation
       ContainerUtil.addIfNotNull(navigatables, ErlangNavigationUtil.getNavigatableSpecFun(targetPresentation, specFun));
     }
 
-    return navigatables.toArray(new NavigatablePsiElement[navigatables.size()]);
+    return navigatables.toArray(new NavigatablePsiElement[0]);
   }
 }