diff --git a/plugins/org.eclipse.reddeer.gef.spy/src/org/eclipse/reddeer/gef/spy/view/GEFSpyView.java b/plugins/org.eclipse.reddeer.gef.spy/src/org/eclipse/reddeer/gef/spy/view/GEFSpyView.java
index 7907ab86f..efb88c0f7 100644
--- a/plugins/org.eclipse.reddeer.gef.spy/src/org/eclipse/reddeer/gef/spy/view/GEFSpyView.java
+++ b/plugins/org.eclipse.reddeer.gef.spy/src/org/eclipse/reddeer/gef/spy/view/GEFSpyView.java
@@ -114,7 +114,7 @@ protected void createTree(TreeNodeExt node) {
 		Object obj = node.getValue();
 		if (obj instanceof EditPart) {
 			EditPart editPart = (EditPart) obj;
-			List<Object> children = editPart.getChildren();
+			List<? extends EditPart> children = editPart.getChildren();
 			for (Object child : children) {
 				TreeNodeExt newNode = new TreeNodeExt(child);
 				createTree(newNode);
diff --git a/plugins/org.eclipse.reddeer.gef/src/org/eclipse/reddeer/gef/finder/EditPartFinder.java b/plugins/org.eclipse.reddeer.gef/src/org/eclipse/reddeer/gef/finder/EditPartFinder.java
index 5d1f8e58d..025dfeea8 100644
--- a/plugins/org.eclipse.reddeer.gef/src/org/eclipse/reddeer/gef/finder/EditPartFinder.java
+++ b/plugins/org.eclipse.reddeer.gef/src/org/eclipse/reddeer/gef/finder/EditPartFinder.java
@@ -28,7 +28,7 @@ public class EditPartFinder extends Finder<EditPart> {
 	@SuppressWarnings("unchecked")
 	@Override
 	public List<EditPart> getChildren(EditPart child) {
-		return child.getChildren();
+		return (List<EditPart>) child.getChildren();
 	}
 
 }
diff --git a/plugins/org.eclipse.reddeer.gef/src/org/eclipse/reddeer/gef/util/DumpUtils.java b/plugins/org.eclipse.reddeer.gef/src/org/eclipse/reddeer/gef/util/DumpUtils.java
index 192c1ddd4..f8e08c66e 100644
--- a/plugins/org.eclipse.reddeer.gef/src/org/eclipse/reddeer/gef/util/DumpUtils.java
+++ b/plugins/org.eclipse.reddeer.gef/src/org/eclipse/reddeer/gef/util/DumpUtils.java
@@ -65,7 +65,7 @@ public static void dump(EditPart parent, int indent) {
 			dump(((GraphicalEditPart) parent).getFigure(), indent + 1);
 		}
 		@SuppressWarnings("unchecked")
-		List<EditPart> editParts = parent.getChildren();
+		List<EditPart> editParts = (List<EditPart>) parent.getChildren();
 		for (EditPart editPart : editParts) {
 			dump(editPart, indent + 1);
 		}