diff --git a/org.eclipse.tm.terminal.serial/src/org/eclipse/tm/terminal/internal/serial/SerialProperties.java b/org.eclipse.tm.terminal.serial/src/org/eclipse/tm/terminal/internal/serial/SerialProperties.java
index 63d80c4b3ab..7560dc49a03 100644
--- a/org.eclipse.tm.terminal.serial/src/org/eclipse/tm/terminal/internal/serial/SerialProperties.java
+++ b/org.eclipse.tm.terminal.serial/src/org/eclipse/tm/terminal/internal/serial/SerialProperties.java
@@ -88,7 +88,7 @@ public class SerialProperties {
 		return fDefaultFlowControl;
 	}
 	public String getDefaultTimeout() {
-		return "5";
+		return "5"; //$NON-NLS-1$
 	}
 	protected void setupProperties() {
 		fSerialPortTable = new Vector();
@@ -140,7 +140,7 @@ public class SerialProperties {
 		fDefaultParity = (String) fParityTable.get(0);
 		fDefaultFlowControl = (String) fFlowControlTable.get(0);
 
-		Enumeration portIdEnum= CommPortIdentifier.getPortIdentifiers();;
+		Enumeration portIdEnum= CommPortIdentifier.getPortIdentifiers();
 		while (portIdEnum.hasMoreElements()) {
 			CommPortIdentifier identifier = (CommPortIdentifier) portIdEnum.nextElement();
 			String strName = identifier.getName();
diff --git a/org.eclipse.tm.terminal.serial/src/org/eclipse/tm/terminal/internal/serial/SerialSettings.java b/org.eclipse.tm.terminal.serial/src/org/eclipse/tm/terminal/internal/serial/SerialSettings.java
index dc61203e140..f0621c77062 100644
--- a/org.eclipse.tm.terminal.serial/src/org/eclipse/tm/terminal/internal/serial/SerialSettings.java
+++ b/org.eclipse.tm.terminal.serial/src/org/eclipse/tm/terminal/internal/serial/SerialSettings.java
@@ -163,7 +163,7 @@ public class SerialSettings implements ISerialSettings {
 		fStopBits = store.get("StopBits", fProperties.getDefaultStopBits());//$NON-NLS-1$
 		fParity = store.get("Parity", fProperties.getDefaultParity());//$NON-NLS-1$
 		fFlowControl = store.get("FlowControl", fProperties.getDefaultFlowControl());//$NON-NLS-1$
-		fTimeout = store.get("Timeout",fProperties.getDefaultTimeout());
+		fTimeout = store.get("Timeout",fProperties.getDefaultTimeout()); //$NON-NLS-1$
 	}
 
 	public void save(ISettingsStore store) {
diff --git a/org.eclipse.tm.terminal.serial/src/org/eclipse/tm/terminal/internal/serial/SerialSettingsPage.java b/org.eclipse.tm.terminal.serial/src/org/eclipse/tm/terminal/internal/serial/SerialSettingsPage.java
index 01504d9a5fc..93f007a8805 100644
--- a/org.eclipse.tm.terminal.serial/src/org/eclipse/tm/terminal/internal/serial/SerialSettingsPage.java
+++ b/org.eclipse.tm.terminal.serial/src/org/eclipse/tm/terminal/internal/serial/SerialSettingsPage.java
@@ -105,7 +105,7 @@ public class SerialSettingsPage implements ISettingsPage {
 		composite.setLayout(gridLayout);
 		composite.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
 
-		fSerialPortCombo=addLabeledCombo(composite, SerialMessages.PORT + ":");
+		fSerialPortCombo=addLabeledCombo(composite, SerialMessages.PORT + ":"); //$NON-NLS-1$
 		fBaudRateCombo=addLabeledCombo(composite, SerialMessages.BAUDRATE + ":"); //$NON-NLS-1$
 		fDataBitsCombo=addLabeledCombo(composite, SerialMessages.DATABITS + ":"); //$NON-NLS-1$
 		fStopBitsCombo=addLabeledCombo(composite, SerialMessages.STOPBITS + ":"); //$NON-NLS-1$