diff --git a/terminal/plugins/org.eclipse.tm.terminal.control/plugin.properties b/terminal/plugins/org.eclipse.tm.terminal.control/plugin.properties
index 12d28ee07dc..6ac4936405a 100644
--- a/terminal/plugins/org.eclipse.tm.terminal.control/plugin.properties
+++ b/terminal/plugins/org.eclipse.tm.terminal.control/plugin.properties
@@ -42,3 +42,5 @@ terminal.command.quickaccess.name=Quick Access
 terminal.preferences.name = Terminal
 terminal.font.description = The font for the terminal console.
 terminal.font.label = Terminal Console Font
+
+terminal.connectors.name = Terminal Connector Extensions
diff --git a/terminal/plugins/org.eclipse.tm.terminal.control/plugin.xml b/terminal/plugins/org.eclipse.tm.terminal.control/plugin.xml
index ed656d41978..6ec699f0f5c 100644
--- a/terminal/plugins/org.eclipse.tm.terminal.control/plugin.xml
+++ b/terminal/plugins/org.eclipse.tm.terminal.control/plugin.xml
@@ -19,7 +19,7 @@
 # Martin Oberhuber (Wind River) - [434939] Fix Keybinding conflicts with JEE Luna package
 -->
 <plugin>
-   <extension-point id="connectors" name="Terminal Connector Extensions" schema="schema/connectors.exsd"/>
+   <extension-point id="connectors" name="%terminal.connectors.name" schema="schema/connectors.exsd"/>
    
    <extension point="org.eclipse.ui.contexts">           
       <context
diff --git a/terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/internal/terminal/control/actions/TerminalActionCopy.java b/terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/internal/terminal/control/actions/TerminalActionCopy.java
index 48e3b3cb17f..d504de61786 100644
--- a/terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/internal/terminal/control/actions/TerminalActionCopy.java
+++ b/terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/internal/terminal/control/actions/TerminalActionCopy.java
@@ -60,10 +60,10 @@ public class TerminalActionCopy extends AbstractTerminalAction {
 	@Override
 	public void updateAction(boolean aboutToShow) {
 		ITerminalViewControl target = getTarget();
-		boolean bEnabled = target != null;
-		if (aboutToShow && bEnabled) {
-			bEnabled = target.getSelection().length() > 0;
+		if (aboutToShow && target != null) {
+			setEnabled(!target.getSelection().isEmpty());
+		} else {
+			setEnabled(false);
 		}
-		setEnabled(bEnabled);
 	}
 }
diff --git a/terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/internal/terminal/control/actions/TerminalActionPaste.java b/terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/internal/terminal/control/actions/TerminalActionPaste.java
index 3f086813124..2003f8e9270 100644
--- a/terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/internal/terminal/control/actions/TerminalActionPaste.java
+++ b/terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/internal/terminal/control/actions/TerminalActionPaste.java
@@ -58,10 +58,16 @@ public class TerminalActionPaste extends AbstractTerminalAction {
 	@Override
 	public void updateAction(boolean aboutToShow) {
 		ITerminalViewControl target = getTarget();
-		boolean bEnabled = target != null && target.getClipboard() != null && !target.getClipboard().isDisposed();
-		if (bEnabled) {
-			String strText = (String) target.getClipboard().getContents(TextTransfer.getInstance());
-			bEnabled = ((strText != null) && (!strText.equals("")) && (target.getState() == TerminalState.CONNECTED));//$NON-NLS-1$
+		boolean bEnabled = false;
+		if (target != null) {
+			if (target.getState() == TerminalState.CONNECTED) {
+				if (target.getClipboard() != null && !target.getClipboard().isDisposed()) {
+					String strText = (String) target.getClipboard().getContents(TextTransfer.getInstance());
+					if (strText != null && !strText.isEmpty()) {
+						bEnabled = true;
+					}
+				}
+			}
 		}
 		setEnabled(bEnabled);
 	}
diff --git a/terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/internal/terminal/emulator/EditActionAccelerators.java b/terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/internal/terminal/emulator/EditActionAccelerators.java
index 86d25d4519c..2a08ae46685 100644
--- a/terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/internal/terminal/emulator/EditActionAccelerators.java
+++ b/terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/internal/terminal/emulator/EditActionAccelerators.java
@@ -24,7 +24,7 @@ class EditActionAccelerators {
 	private static final String COPY_COMMAND_ID = "org.eclipse.tm.terminal.copy"; //$NON-NLS-1$
 	private static final String PASTE_COMMAND_ID = "org.eclipse.tm.terminal.paste"; //$NON-NLS-1$
 
-	private final Map commandIdsByAccelerator = new HashMap();
+	private final Map<Integer, String> commandIdsByAccelerator = new HashMap<Integer, String>();
 
 	private void load() {
 		addAccelerator(COPY_COMMAND_ID);
diff --git a/terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/internal/terminal/provisional/api/AbstractSettingsPage.java b/terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/internal/terminal/provisional/api/AbstractSettingsPage.java
index 324de7a1e2b..971e30e05f1 100644
--- a/terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/internal/terminal/provisional/api/AbstractSettingsPage.java
+++ b/terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/internal/terminal/provisional/api/AbstractSettingsPage.java
@@ -31,7 +31,7 @@ public abstract class AbstractSettingsPage implements ISettingsPage, IMessagePro
 	private int messageType = IMessageProvider.NONE;
 
 	// Reference to the listener
-	private final ListenerList listeners = new ListenerList();
+	private final ListenerList<Listener> listeners = new ListenerList<>();
 
 	// Flag to control the control decorations
 	private boolean hasDecoration = false;
diff --git a/terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/internal/terminal/provisional/api/TerminalConnectorExtension.java b/terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/internal/terminal/provisional/api/TerminalConnectorExtension.java
index d9717d6bca1..1db1bbb54eb 100644
--- a/terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/internal/terminal/provisional/api/TerminalConnectorExtension.java
+++ b/terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/internal/terminal/provisional/api/TerminalConnectorExtension.java
@@ -49,7 +49,7 @@ public class TerminalConnectorExtension {
 		}
 		String hidden = config.getAttribute("hidden"); //$NON-NLS-1$
 		boolean isHidden = hidden != null ? Boolean.parseBoolean(hidden) : false;
-		TerminalConnector.Factory factory = () -> (TerminalConnectorImpl) config.createExecutableExtension("class");
+		TerminalConnector.Factory factory = () -> (TerminalConnectorImpl) config.createExecutableExtension("class"); //$NON-NLS-1$
 		return new TerminalConnector(factory, id, name, isHidden);
 	}