diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/RSEUIPlugin.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/RSEUIPlugin.java
index ff7c61b7cde..e009d91fcd9 100644
--- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/RSEUIPlugin.java
+++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/RSEUIPlugin.java
@@ -591,7 +591,7 @@ public class RSEUIPlugin extends SystemBasePlugin implements ISystemMessageProvi
           // rebuild profiles
     	  SystemStartHere.getSystemProfileManager(); // create folders per profile
           // clear in-memory settings for all connections, then restore from disk
-          ((SystemRegistry)_systemRegistry).reset();
+          _systemRegistry.reset();
           // restore in-memory settings for all filter pools and subsystems
     	  if (proxies != null)
     	  	for (int idx=0; idx < proxies.length; idx++)
@@ -808,7 +808,7 @@ public class RSEUIPlugin extends SystemBasePlugin implements ISystemMessageProvi
           }
           
         }
-    	return (SystemRegistry)_systemRegistry;
+    	return _systemRegistry;
     }
 
     /**
@@ -1065,7 +1065,8 @@ public class RSEUIPlugin extends SystemBasePlugin implements ISystemMessageProvi
 	 * @param msgId - the ID of the message to retrieve. This is the concatenation of the
 	 *   message's component abbreviation, subcomponent abbreviation, and message ID as declared
 	 *   in the message xml file.
-	 * @param subsVars - an array of objects to substitute in for %1, %2, etc
+	 * @param subsVar - an array of objects to substitute in for %1, %2, etc.
+	 * @return the message.
 	 */
 	public static SystemMessage getPluginMessage(String msgId, Object subsVar)
 	{
diff --git a/rse/plugins/org.eclipse.rse.ui/systems/org/eclipse/rse/core/PasswordPersistenceManager.java b/rse/plugins/org.eclipse.rse.ui/systems/org/eclipse/rse/core/PasswordPersistenceManager.java
index adf1fad90e8..2ff89987683 100644
--- a/rse/plugins/org.eclipse.rse.ui/systems/org/eclipse/rse/core/PasswordPersistenceManager.java
+++ b/rse/plugins/org.eclipse.rse.ui/systems/org/eclipse/rse/core/PasswordPersistenceManager.java
@@ -88,14 +88,16 @@ public class PasswordPersistenceManager {
 		}		
 		
 		/**
-		 * @return
+		 * Returns the system type.
+		 * @return the system type.
 		 */
 		public String getSystemType() {
 			return _systemType;
 		}
 
 		/**
-		 * @return
+		 * Returns whether the user ID is case sensitive.
+		 * @return <code>true</code> if the user ID is case sensitive, <code>false</code> otherwise.
 		 */
 		public boolean isUserIDCaseSensitive() {
 			return _userIDCaseSensitive;