diff --git a/features/.settings/org.eclipse.core.resources.prefs b/features/.settings/org.eclipse.core.resources.prefs
deleted file mode 100644
index 99f26c0203..0000000000
--- a/features/.settings/org.eclipse.core.resources.prefs
+++ /dev/null
@@ -1,2 +0,0 @@
-eclipse.preferences.version=1
-encoding/<project>=UTF-8
diff --git a/plugins/org.python.pydev/src/org/python/pydev/editor/KeyAssistDialog.java b/plugins/org.python.pydev/src/org/python/pydev/editor/KeyAssistDialog.java
index edecea38ee..36efcca608 100644
--- a/plugins/org.python.pydev/src/org/python/pydev/editor/KeyAssistDialog.java
+++ b/plugins/org.python.pydev/src/org/python/pydev/editor/KeyAssistDialog.java
@@ -11,9 +11,9 @@
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
-import java.util.Map.Entry;
 import java.util.SortedMap;
 import java.util.TreeMap;
+import java.util.Map.Entry;
 
 import org.eclipse.jface.dialogs.Dialog;
 import org.eclipse.jface.dialogs.PopupDialog;
@@ -85,7 +85,7 @@ public KeyAssistDialog(final PyEdit pyedit) {
         //otherwise the focus would end up in a null Control in linux (GTK),
         //which made the dialog show and hide quickly and go out of the ctrl+2 mode.
         //See: http://sourceforge.net/tracker/?func=detail&aid=2984743&group_id=85796&atid=577329
-        super(null, PopupDialog.HOVER_SHELLSTYLE, false, false, false, false, false, null, null);
+        super((Shell) null, PopupDialog.HOVER_SHELLSTYLE, false, false, false, false, null, null);
         this.setInfoText("   Ctrl+2 actions   ");
     }
 
@@ -355,7 +355,7 @@ public final int open(Collection<ActionInfo> bindings, OfflineActionTarget offli
      */
     private final void registerShellType() {
         final Shell shell = getShell();
-        final IContextService contextService = EditorUtils.getActiveWorkbenchWindow().getService(
+        final IContextService contextService = (IContextService) EditorUtils.getActiveWorkbenchWindow().getService(
                 IContextService.class);
         contextService.registerShell(shell, contextService.getShellType((Shell) shell.getParent()));
     }