--- com.mountainminds.eclemma.ui/src/com/mountainminds/eclemma/internal/ui/annotation/CoverageAnnotationModel.java.orig	2016-05-04 11:36:52.939904001 +0100
+++ com.mountainminds.eclemma.ui/src/com/mountainminds/eclemma/internal/ui/annotation/CoverageAnnotationModel.java	2016-05-04 12:33:57.233842790 +0100
@@ -287,8 +287,8 @@
     throw new UnsupportedOperationException();
   }
 
-  public Iterator<?> getAnnotationIterator() {
-    return annotations.iterator();
+  public Iterator<Annotation> getAnnotationIterator() {
+    return new ArrayList(annotations).iterator();
   }
 
   public Position getPosition(Annotation annotation) {
--- com.mountainminds.eclemma.ui/src/com/mountainminds/eclemma/internal/ui/ScopeViewer.java.orig	2016-05-04 12:46:15.534795170 +0100
+++ com.mountainminds.eclemma.ui/src/com/mountainminds/eclemma/internal/ui/ScopeViewer.java	2016-05-04 12:49:58.208764772 +0100
@@ -83,7 +83,7 @@
       IPackageFragmentRoot root1 = (IPackageFragmentRoot) e1;
       IPackageFragmentRoot root2 = (IPackageFragmentRoot) e2;
       @SuppressWarnings("unchecked")
-      final Comparator<Object> comparator = getComparator();
+      final Comparator<? super String> comparator = getComparator();
       int result = comparator.compare(root1.getJavaProject().getElementName(),
           root2.getJavaProject().getElementName());
       if (result != 0)