diff --git a/shell/src/main/java/org/apache/sqoop/shell/CloneJobFunction.java b/shell/src/main/java/org/apache/sqoop/shell/CloneJobFunction.java
index de7774b4..b28ece28 100644
--- a/shell/src/main/java/org/apache/sqoop/shell/CloneJobFunction.java
+++ b/shell/src/main/java/org/apache/sqoop/shell/CloneJobFunction.java
@@ -40,6 +40,8 @@
  */
 @SuppressWarnings("serial")
 public class CloneJobFunction extends SqoopFunction {
+  private static final long serialVersionUID = 1L;
+
   @SuppressWarnings("static-access")
   public CloneJobFunction() {
     this.addOption(OptionBuilder
diff --git a/shell/src/main/java/org/apache/sqoop/shell/CloneLinkFunction.java b/shell/src/main/java/org/apache/sqoop/shell/CloneLinkFunction.java
index 17ad5cc3..b76346b4 100644
--- a/shell/src/main/java/org/apache/sqoop/shell/CloneLinkFunction.java
+++ b/shell/src/main/java/org/apache/sqoop/shell/CloneLinkFunction.java
@@ -39,6 +39,8 @@
  */
 @SuppressWarnings("serial")
 public class CloneLinkFunction extends SqoopFunction {
+  private static final long serialVersionUID = 1L;
+
   @SuppressWarnings("static-access")
   public CloneLinkFunction() {
     this.addOption(OptionBuilder
diff --git a/shell/src/main/java/org/apache/sqoop/shell/CreateJobFunction.java b/shell/src/main/java/org/apache/sqoop/shell/CreateJobFunction.java
index b706397f..4091c2d2 100644
--- a/shell/src/main/java/org/apache/sqoop/shell/CreateJobFunction.java
+++ b/shell/src/main/java/org/apache/sqoop/shell/CreateJobFunction.java
@@ -41,6 +41,8 @@
  */
 @SuppressWarnings("serial")
 public class CreateJobFunction extends  SqoopFunction {
+  private static final long serialVersionUID = 1L;
+
   @SuppressWarnings("static-access")
   public CreateJobFunction() {
     this.addOption(OptionBuilder
diff --git a/shell/src/main/java/org/apache/sqoop/shell/CreateLinkFunction.java b/shell/src/main/java/org/apache/sqoop/shell/CreateLinkFunction.java
index 26190947..21e4092b 100644
--- a/shell/src/main/java/org/apache/sqoop/shell/CreateLinkFunction.java
+++ b/shell/src/main/java/org/apache/sqoop/shell/CreateLinkFunction.java
@@ -40,6 +40,8 @@
  */
 @SuppressWarnings("serial")
 public class CreateLinkFunction extends SqoopFunction {
+  private static final long serialVersionUID = 1L;
+
   @SuppressWarnings("static-access")
   public CreateLinkFunction() {
     this.addOption(OptionBuilder
diff --git a/shell/src/main/java/org/apache/sqoop/shell/CreateRoleFunction.java b/shell/src/main/java/org/apache/sqoop/shell/CreateRoleFunction.java
index 10d06b52..252a4a04 100644
--- a/shell/src/main/java/org/apache/sqoop/shell/CreateRoleFunction.java
+++ b/shell/src/main/java/org/apache/sqoop/shell/CreateRoleFunction.java
@@ -31,6 +31,8 @@
 
 @SuppressWarnings("serial")
 public class CreateRoleFunction extends SqoopFunction {
+  private static final long serialVersionUID = 1L;
+
   @SuppressWarnings("static-access")
   public CreateRoleFunction() {
     this.addOption(OptionBuilder
diff --git a/shell/src/main/java/org/apache/sqoop/shell/DeleteJobFunction.java b/shell/src/main/java/org/apache/sqoop/shell/DeleteJobFunction.java
index 229879b3..7f3a76f8 100644
--- a/shell/src/main/java/org/apache/sqoop/shell/DeleteJobFunction.java
+++ b/shell/src/main/java/org/apache/sqoop/shell/DeleteJobFunction.java
@@ -29,6 +29,7 @@
  */
 @SuppressWarnings("serial")
 public class DeleteJobFunction extends SqoopFunction {
+  private static final long serialVersionUID = 1L;
 
   @SuppressWarnings("static-access")
   public DeleteJobFunction() {
diff --git a/shell/src/main/java/org/apache/sqoop/shell/DeleteLinkFunction.java b/shell/src/main/java/org/apache/sqoop/shell/DeleteLinkFunction.java
index bb9c7c56..1d45b627 100644
--- a/shell/src/main/java/org/apache/sqoop/shell/DeleteLinkFunction.java
+++ b/shell/src/main/java/org/apache/sqoop/shell/DeleteLinkFunction.java
@@ -29,6 +29,8 @@
  */
 @SuppressWarnings("serial")
 public class DeleteLinkFunction extends SqoopFunction {
+  private static final long serialVersionUID = 1L;
+
   @SuppressWarnings("static-access")
   public DeleteLinkFunction() {
     this.addOption(OptionBuilder
diff --git a/shell/src/main/java/org/apache/sqoop/shell/DeleteRoleFunction.java b/shell/src/main/java/org/apache/sqoop/shell/DeleteRoleFunction.java
index 7209dca0..27bf2237 100644
--- a/shell/src/main/java/org/apache/sqoop/shell/DeleteRoleFunction.java
+++ b/shell/src/main/java/org/apache/sqoop/shell/DeleteRoleFunction.java
@@ -29,6 +29,8 @@
 
 @SuppressWarnings("serial")
 public class DeleteRoleFunction extends SqoopFunction {
+  private static final long serialVersionUID = 1L;
+
   @SuppressWarnings("static-access")
   public DeleteRoleFunction() {
     this.addOption(OptionBuilder
diff --git a/shell/src/main/java/org/apache/sqoop/shell/DisableJobFunction.java b/shell/src/main/java/org/apache/sqoop/shell/DisableJobFunction.java
index a0661721..df693eb0 100644
--- a/shell/src/main/java/org/apache/sqoop/shell/DisableJobFunction.java
+++ b/shell/src/main/java/org/apache/sqoop/shell/DisableJobFunction.java
@@ -29,6 +29,7 @@
  */
 @SuppressWarnings("serial")
 public class DisableJobFunction extends SqoopFunction {
+  private static final long serialVersionUID = 1L;
 
   @SuppressWarnings("static-access")
   public DisableJobFunction() {
diff --git a/shell/src/main/java/org/apache/sqoop/shell/DisableLinkFunction.java b/shell/src/main/java/org/apache/sqoop/shell/DisableLinkFunction.java
index 0f38b99a..50cec54c 100644
--- a/shell/src/main/java/org/apache/sqoop/shell/DisableLinkFunction.java
+++ b/shell/src/main/java/org/apache/sqoop/shell/DisableLinkFunction.java
@@ -29,6 +29,8 @@
  */
 @SuppressWarnings("serial")
 public class DisableLinkFunction extends SqoopFunction {
+  private static final long serialVersionUID = 1L;
+
   @SuppressWarnings("static-access")
   public DisableLinkFunction() {
     this.addOption(OptionBuilder
diff --git a/shell/src/main/java/org/apache/sqoop/shell/EnableJobFunction.java b/shell/src/main/java/org/apache/sqoop/shell/EnableJobFunction.java
index 8b4435e6..73962bba 100644
--- a/shell/src/main/java/org/apache/sqoop/shell/EnableJobFunction.java
+++ b/shell/src/main/java/org/apache/sqoop/shell/EnableJobFunction.java
@@ -29,6 +29,7 @@
  */
 @SuppressWarnings("serial")
 public class EnableJobFunction extends SqoopFunction {
+  private static final long serialVersionUID = 1L;
 
   @SuppressWarnings("static-access")
   public EnableJobFunction() {
diff --git a/shell/src/main/java/org/apache/sqoop/shell/EnableLinkFunction.java b/shell/src/main/java/org/apache/sqoop/shell/EnableLinkFunction.java
index 64814d24..6e3a5dfa 100644
--- a/shell/src/main/java/org/apache/sqoop/shell/EnableLinkFunction.java
+++ b/shell/src/main/java/org/apache/sqoop/shell/EnableLinkFunction.java
@@ -29,6 +29,8 @@
  */
 @SuppressWarnings("serial")
 public class EnableLinkFunction extends SqoopFunction {
+  private static final long serialVersionUID = 1L;
+
   @SuppressWarnings("static-access")
   public EnableLinkFunction() {
     this.addOption(OptionBuilder
diff --git a/shell/src/main/java/org/apache/sqoop/shell/GrantPrivilegeFunction.java b/shell/src/main/java/org/apache/sqoop/shell/GrantPrivilegeFunction.java
index b7bb4b90..1b0c52fa 100644
--- a/shell/src/main/java/org/apache/sqoop/shell/GrantPrivilegeFunction.java
+++ b/shell/src/main/java/org/apache/sqoop/shell/GrantPrivilegeFunction.java
@@ -32,6 +32,8 @@
 import static org.apache.sqoop.shell.ShellEnvironment.*;
 
 public class GrantPrivilegeFunction extends SqoopFunction {
+  private static final long serialVersionUID = 1L;
+
   @SuppressWarnings("static-access")
   public GrantPrivilegeFunction() {
     this.addOption(OptionBuilder
diff --git a/shell/src/main/java/org/apache/sqoop/shell/GrantRoleFunction.java b/shell/src/main/java/org/apache/sqoop/shell/GrantRoleFunction.java
index 2714e815..ef0972b4 100644
--- a/shell/src/main/java/org/apache/sqoop/shell/GrantRoleFunction.java
+++ b/shell/src/main/java/org/apache/sqoop/shell/GrantRoleFunction.java
@@ -33,6 +33,8 @@
 
 @SuppressWarnings("serial")
 public class GrantRoleFunction extends SqoopFunction {
+  private static final long serialVersionUID = 1L;
+
   @SuppressWarnings("static-access")
   public GrantRoleFunction() {
     this.addOption(OptionBuilder
diff --git a/shell/src/main/java/org/apache/sqoop/shell/RevokePrivilegeFunction.java b/shell/src/main/java/org/apache/sqoop/shell/RevokePrivilegeFunction.java
index d32f6ddd..efe3042e 100644
--- a/shell/src/main/java/org/apache/sqoop/shell/RevokePrivilegeFunction.java
+++ b/shell/src/main/java/org/apache/sqoop/shell/RevokePrivilegeFunction.java
@@ -35,6 +35,8 @@
 import static org.apache.sqoop.shell.utils.ConfigFiller.errorMessage;
 
 public class RevokePrivilegeFunction extends SqoopFunction {
+  private static final long serialVersionUID = 1L;
+
   @SuppressWarnings("static-access")
   public RevokePrivilegeFunction() {
     this.addOption(OptionBuilder
diff --git a/shell/src/main/java/org/apache/sqoop/shell/RevokeRoleFunction.java b/shell/src/main/java/org/apache/sqoop/shell/RevokeRoleFunction.java
index 8ce3518e..90aa10a7 100644
--- a/shell/src/main/java/org/apache/sqoop/shell/RevokeRoleFunction.java
+++ b/shell/src/main/java/org/apache/sqoop/shell/RevokeRoleFunction.java
@@ -33,6 +33,8 @@
 
 @SuppressWarnings("serial")
 public class RevokeRoleFunction extends SqoopFunction {
+  private static final long serialVersionUID = 1L;
+
   @SuppressWarnings("static-access")
   public RevokeRoleFunction() {
     this.addOption(OptionBuilder
diff --git a/shell/src/main/java/org/apache/sqoop/shell/SetOptionFunction.java b/shell/src/main/java/org/apache/sqoop/shell/SetOptionFunction.java
index 3f5f5703..3613302b 100644
--- a/shell/src/main/java/org/apache/sqoop/shell/SetOptionFunction.java
+++ b/shell/src/main/java/org/apache/sqoop/shell/SetOptionFunction.java
@@ -29,6 +29,8 @@
  */
 @SuppressWarnings("serial")
 public class SetOptionFunction extends SqoopFunction {
+  private static final long serialVersionUID = 1L;
+
   @SuppressWarnings("static-access")
   public SetOptionFunction() {
     this.addOption(OptionBuilder.hasArg()
diff --git a/shell/src/main/java/org/apache/sqoop/shell/SetServerFunction.java b/shell/src/main/java/org/apache/sqoop/shell/SetServerFunction.java
index 0bab98a1..e430f9d1 100644
--- a/shell/src/main/java/org/apache/sqoop/shell/SetServerFunction.java
+++ b/shell/src/main/java/org/apache/sqoop/shell/SetServerFunction.java
@@ -26,6 +26,7 @@
 
 @SuppressWarnings("serial")
 public class SetServerFunction extends SqoopFunction {
+  private static final long serialVersionUID = 1L;
 
   @SuppressWarnings("static-access")
   public SetServerFunction() {
diff --git a/shell/src/main/java/org/apache/sqoop/shell/ShowConnectorFunction.java b/shell/src/main/java/org/apache/sqoop/shell/ShowConnectorFunction.java
index f2486833..6efb51c0 100644
--- a/shell/src/main/java/org/apache/sqoop/shell/ShowConnectorFunction.java
+++ b/shell/src/main/java/org/apache/sqoop/shell/ShowConnectorFunction.java
@@ -33,6 +33,7 @@
 
 @SuppressWarnings("serial")
 public class ShowConnectorFunction extends SqoopFunction {
+  private static final long serialVersionUID = 1L;
 
   @SuppressWarnings("static-access")
   public ShowConnectorFunction() {
diff --git a/shell/src/main/java/org/apache/sqoop/shell/ShowDriverFunction.java b/shell/src/main/java/org/apache/sqoop/shell/ShowDriverFunction.java
index 421f65d4..77539b35 100644
--- a/shell/src/main/java/org/apache/sqoop/shell/ShowDriverFunction.java
+++ b/shell/src/main/java/org/apache/sqoop/shell/ShowDriverFunction.java
@@ -30,6 +30,8 @@
  */
 @SuppressWarnings("serial")
 public class ShowDriverFunction extends SqoopFunction {
+  private static final long serialVersionUID = 1L;
+
   public ShowDriverFunction() {
   }
 
diff --git a/shell/src/main/java/org/apache/sqoop/shell/ShowJobFunction.java b/shell/src/main/java/org/apache/sqoop/shell/ShowJobFunction.java
index c2837276..21873cc9 100644
--- a/shell/src/main/java/org/apache/sqoop/shell/ShowJobFunction.java
+++ b/shell/src/main/java/org/apache/sqoop/shell/ShowJobFunction.java
@@ -39,6 +39,8 @@
  */
 @SuppressWarnings("serial")
 public class ShowJobFunction extends SqoopFunction {
+  private static final long serialVersionUID = 1L;
+
   @SuppressWarnings("static-access")
   public ShowJobFunction() {
     this.addOption(OptionBuilder
diff --git a/shell/src/main/java/org/apache/sqoop/shell/ShowJobStatusFunction.java b/shell/src/main/java/org/apache/sqoop/shell/ShowJobStatusFunction.java
index 4be80036..d0cb2135 100644
--- a/shell/src/main/java/org/apache/sqoop/shell/ShowJobStatusFunction.java
+++ b/shell/src/main/java/org/apache/sqoop/shell/ShowJobStatusFunction.java
@@ -30,6 +30,7 @@
 
 @SuppressWarnings("serial")
 public class ShowJobStatusFunction extends SqoopFunction {
+  private static final long serialVersionUID = 1L;
 
   @SuppressWarnings("static-access")
   public ShowJobStatusFunction() {
diff --git a/shell/src/main/java/org/apache/sqoop/shell/ShowLinkFunction.java b/shell/src/main/java/org/apache/sqoop/shell/ShowLinkFunction.java
index 84194d9f..04dd2286 100644
--- a/shell/src/main/java/org/apache/sqoop/shell/ShowLinkFunction.java
+++ b/shell/src/main/java/org/apache/sqoop/shell/ShowLinkFunction.java
@@ -41,6 +41,8 @@
  */
 @SuppressWarnings("serial")
 public class ShowLinkFunction extends SqoopFunction {
+  private static final long serialVersionUID = 1L;
+
   @SuppressWarnings("static-access")
   public ShowLinkFunction() {
     this.addOption(OptionBuilder
@@ -142,7 +144,7 @@ private List<String> getConnectorNames(List<String> connectorIds) {
     for (String connectorId : connectorIds) {
       if (!connectorIdToName.containsKey(connectorId)) {
         try {
-          MConnector connector = client.getConnector(Long.valueOf(connectorId));
+          MConnector connector = client.getConnector(Long.parseLong(connectorId));
           if (connector != null) {
             connectorIdToName.put(connectorId, connector.getUniqueName());
           }
diff --git a/shell/src/main/java/org/apache/sqoop/shell/ShowOptionFunction.java b/shell/src/main/java/org/apache/sqoop/shell/ShowOptionFunction.java
index 46eabf73..41d3f1ad 100644
--- a/shell/src/main/java/org/apache/sqoop/shell/ShowOptionFunction.java
+++ b/shell/src/main/java/org/apache/sqoop/shell/ShowOptionFunction.java
@@ -29,6 +29,8 @@
  */
 @SuppressWarnings("serial")
 public class ShowOptionFunction extends SqoopFunction {
+  private static final long serialVersionUID = 1L;
+
   /**
    * Construct new object.
    */
diff --git a/shell/src/main/java/org/apache/sqoop/shell/ShowPrincipalFunction.java b/shell/src/main/java/org/apache/sqoop/shell/ShowPrincipalFunction.java
index 94bca856..8935026e 100644
--- a/shell/src/main/java/org/apache/sqoop/shell/ShowPrincipalFunction.java
+++ b/shell/src/main/java/org/apache/sqoop/shell/ShowPrincipalFunction.java
@@ -33,6 +33,8 @@
 
 @SuppressWarnings("serial")
 public class ShowPrincipalFunction extends SqoopFunction {
+  private static final long serialVersionUID = 1L;
+
   @SuppressWarnings("static-access")
   public ShowPrincipalFunction() {
     this.addOption(OptionBuilder
diff --git a/shell/src/main/java/org/apache/sqoop/shell/ShowPrivilegeFunction.java b/shell/src/main/java/org/apache/sqoop/shell/ShowPrivilegeFunction.java
index 6aaa1aab..2cf69724 100644
--- a/shell/src/main/java/org/apache/sqoop/shell/ShowPrivilegeFunction.java
+++ b/shell/src/main/java/org/apache/sqoop/shell/ShowPrivilegeFunction.java
@@ -36,6 +36,8 @@
 
 @SuppressWarnings("serial")
 public class ShowPrivilegeFunction extends SqoopFunction {
+  private static final long serialVersionUID = 1L;
+
   @SuppressWarnings("static-access")
   public ShowPrivilegeFunction() {
     this.addOption(OptionBuilder
diff --git a/shell/src/main/java/org/apache/sqoop/shell/ShowRoleFunction.java b/shell/src/main/java/org/apache/sqoop/shell/ShowRoleFunction.java
index e4c9e818..6b619210 100644
--- a/shell/src/main/java/org/apache/sqoop/shell/ShowRoleFunction.java
+++ b/shell/src/main/java/org/apache/sqoop/shell/ShowRoleFunction.java
@@ -35,6 +35,8 @@
 
 @SuppressWarnings("serial")
 public class ShowRoleFunction extends SqoopFunction {
+  private static final long serialVersionUID = 1L;
+
   @SuppressWarnings("static-access")
   public ShowRoleFunction() {
     this.addOption(OptionBuilder
diff --git a/shell/src/main/java/org/apache/sqoop/shell/ShowServerFunction.java b/shell/src/main/java/org/apache/sqoop/shell/ShowServerFunction.java
index cf9df7fa..902e6d7a 100644
--- a/shell/src/main/java/org/apache/sqoop/shell/ShowServerFunction.java
+++ b/shell/src/main/java/org/apache/sqoop/shell/ShowServerFunction.java
@@ -26,6 +26,8 @@
 
 @SuppressWarnings("serial")
 public class ShowServerFunction extends SqoopFunction {
+  private static final long serialVersionUID = 1L;
+
   @SuppressWarnings("static-access")
   public ShowServerFunction() {
     this.addOption(OptionBuilder
diff --git a/shell/src/main/java/org/apache/sqoop/shell/ShowSubmissionFunction.java b/shell/src/main/java/org/apache/sqoop/shell/ShowSubmissionFunction.java
index 0c006db2..c4d30cb5 100644
--- a/shell/src/main/java/org/apache/sqoop/shell/ShowSubmissionFunction.java
+++ b/shell/src/main/java/org/apache/sqoop/shell/ShowSubmissionFunction.java
@@ -32,6 +32,8 @@
 
 @SuppressWarnings("serial")
 public class ShowSubmissionFunction extends SqoopFunction {
+  private static final long serialVersionUID = 1L;
+
   @SuppressWarnings("static-access")
   public ShowSubmissionFunction() {
     this.addOption(OptionBuilder
diff --git a/shell/src/main/java/org/apache/sqoop/shell/ShowVersionFunction.java b/shell/src/main/java/org/apache/sqoop/shell/ShowVersionFunction.java
index 310d83bf..28d5de70 100644
--- a/shell/src/main/java/org/apache/sqoop/shell/ShowVersionFunction.java
+++ b/shell/src/main/java/org/apache/sqoop/shell/ShowVersionFunction.java
@@ -31,9 +31,9 @@
 
 @SuppressWarnings("serial")
 public class ShowVersionFunction extends SqoopFunction {
+  private static final long serialVersionUID = 1L;
   private VersionResourceRequest versionRequest;
 
-
   @SuppressWarnings("static-access")
   public ShowVersionFunction() {
     this.addOption(OptionBuilder
diff --git a/shell/src/main/java/org/apache/sqoop/shell/SqoopShell.java b/shell/src/main/java/org/apache/sqoop/shell/SqoopShell.java
index e3198397..33fddbfc 100644
--- a/shell/src/main/java/org/apache/sqoop/shell/SqoopShell.java
+++ b/shell/src/main/java/org/apache/sqoop/shell/SqoopShell.java
@@ -17,10 +17,8 @@
  */
 package org.apache.sqoop.shell;
 
-import java.io.BufferedReader;
-import java.io.File;
-import java.io.FileReader;
-import java.io.IOException;
+import java.io.*;
+import java.nio.charset.Charset;
 import java.util.HashSet;
 import java.util.Iterator;
 
@@ -54,7 +52,7 @@ public final class SqoopShell {
   /**
    * Hash of commands that we want to have in history in all cases.
    */
-  public final static HashSet<String> commandsToKeep;
+  private final static HashSet<String> commandsToKeep;
 
   static {
     commandsToKeep = new HashSet<String>();
@@ -149,26 +147,27 @@ public static void main (String[] args) throws Exception {
    * @throws IOException
    */
   private static void interpretFileContent(File script, Groovysh shell) throws IOException {
-    BufferedReader in = new BufferedReader(new FileReader(script));
-    String line;
+    try (BufferedReader in = new BufferedReader(new InputStreamReader(new FileInputStream(script), Charset.forName("UTF-8")))) {
+      String line;
 
-    // Iterate over all lines and executed them one by one
-    while ((line = in.readLine()) != null) {
+      // Iterate over all lines and executed them one by one
+      while ((line = in.readLine()) != null) {
 
-      // Skip comments and empty lines as we don't need to interpret those
-      if(line.isEmpty() || line.startsWith("#")) {
-        continue;
-      }
+        // Skip comments and empty lines as we don't need to interpret those
+        if (line.isEmpty() || line.startsWith("#")) {
+          continue;
+        }
 
-      // Render shell and command to get user perception that it was run as usual
-      print(shell.renderPrompt());
-      println(line);
+        // Render shell and command to get user perception that it was run as usual
+        print(shell.renderPrompt());
+        println(line);
 
-      // Manually trigger command line parsing
-      Object result = shell.execute(line);
+        // Manually trigger command line parsing
+        Object result = shell.execute(line);
 
-      if (result == null) {
-        break;
+        if (result == null) {
+          break;
+        }
       }
     }
   }
diff --git a/shell/src/main/java/org/apache/sqoop/shell/StartJobFunction.java b/shell/src/main/java/org/apache/sqoop/shell/StartJobFunction.java
index 4d326852..136893ec 100644
--- a/shell/src/main/java/org/apache/sqoop/shell/StartJobFunction.java
+++ b/shell/src/main/java/org/apache/sqoop/shell/StartJobFunction.java
@@ -34,6 +34,7 @@
 
 @SuppressWarnings("serial")
 public class StartJobFunction extends SqoopFunction {
+  private static final long serialVersionUID = 1L;
   public static final Logger LOG = Logger.getLogger(StartJobFunction.class);
 
   @SuppressWarnings("static-access")
@@ -53,27 +54,10 @@ public Object executeFunction(CommandLine line, boolean isInteractive) {
     // Poll until finished
     if (line.hasOption(Constants.OPT_SYNCHRONOUS) && line.hasOption(Constants.OPT_JID)) {
       long pollTimeout = getPollTimeout();
-      SubmissionCallback callback = new SubmissionCallback() {
-        @Override
-        public void submitted(MSubmission submission) {
-          SubmissionDisplayer.displayHeader(submission);
-          SubmissionDisplayer.displayProgress(submission);
-        }
-
-        @Override
-        public void updated(MSubmission submission) {
-          SubmissionDisplayer.displayProgress(submission);
-        }
-
-        @Override
-        public void finished(MSubmission submission) {
-          SubmissionDisplayer.displayFooter(submission);
-        }
-      };
 
       try {
         //client.startJob(getLong(line, Constants.OPT_JID), callback, pollTimeout);
-        client.startJob(line.getOptionValue(Constants.OPT_JID), callback, pollTimeout);
+        client.startJob(line.getOptionValue(Constants.OPT_JID), new SJFCallback(), pollTimeout);
       } catch (InterruptedException e) {
         throw new SqoopException(ShellError.SHELL_0007, e);
       }
@@ -92,4 +76,22 @@ public void finished(MSubmission submission) {
 
     return Status.OK;
   }
+
+  private static class SJFCallback implements SubmissionCallback {
+    @Override
+    public void submitted(MSubmission submission) {
+      SubmissionDisplayer.displayHeader(submission);
+      SubmissionDisplayer.displayProgress(submission);
+    }
+
+    @Override
+    public void updated(MSubmission submission) {
+      SubmissionDisplayer.displayProgress(submission);
+    }
+
+    @Override
+    public void finished(MSubmission submission) {
+      SubmissionDisplayer.displayFooter(submission);
+    }
+  }
 }
diff --git a/shell/src/main/java/org/apache/sqoop/shell/StopJobFunction.java b/shell/src/main/java/org/apache/sqoop/shell/StopJobFunction.java
index a1980d4a..fe779034 100644
--- a/shell/src/main/java/org/apache/sqoop/shell/StopJobFunction.java
+++ b/shell/src/main/java/org/apache/sqoop/shell/StopJobFunction.java
@@ -29,6 +29,8 @@
 
 @SuppressWarnings("serial")
 public class StopJobFunction extends SqoopFunction {
+  private static final long serialVersionUID = 1L;
+
   @SuppressWarnings("static-access")
   public StopJobFunction() {
     this.addOption(OptionBuilder.hasArg().withArgName(Constants.OPT_JID)
diff --git a/shell/src/main/java/org/apache/sqoop/shell/UpdateJobFunction.java b/shell/src/main/java/org/apache/sqoop/shell/UpdateJobFunction.java
index 5c155320..ba85d636 100644
--- a/shell/src/main/java/org/apache/sqoop/shell/UpdateJobFunction.java
+++ b/shell/src/main/java/org/apache/sqoop/shell/UpdateJobFunction.java
@@ -40,6 +40,8 @@
  */
 @SuppressWarnings("serial")
 public class UpdateJobFunction extends SqoopFunction {
+  private static final long serialVersionUID = 1L;
+
   @SuppressWarnings("static-access")
   public UpdateJobFunction() {
     this.addOption(OptionBuilder
diff --git a/shell/src/main/java/org/apache/sqoop/shell/UpdateLinkFunction.java b/shell/src/main/java/org/apache/sqoop/shell/UpdateLinkFunction.java
index bf1ddabc..e815220f 100644
--- a/shell/src/main/java/org/apache/sqoop/shell/UpdateLinkFunction.java
+++ b/shell/src/main/java/org/apache/sqoop/shell/UpdateLinkFunction.java
@@ -39,6 +39,8 @@
  */
 @SuppressWarnings("serial")
 public class UpdateLinkFunction extends SqoopFunction {
+  private static final long serialVersionUID = 1L;
+
   @SuppressWarnings("static-access")
   public UpdateLinkFunction() {
     this.addOption(OptionBuilder
diff --git a/shell/src/main/java/org/apache/sqoop/shell/utils/ConfigFiller.java b/shell/src/main/java/org/apache/sqoop/shell/utils/ConfigFiller.java
index b3345b66..63b12673 100644
--- a/shell/src/main/java/org/apache/sqoop/shell/utils/ConfigFiller.java
+++ b/shell/src/main/java/org/apache/sqoop/shell/utils/ConfigFiller.java
@@ -180,16 +180,22 @@ public static boolean fillInput(String prefix, MInput input, CommandLine line) t
     // Based on the input type, let's perconfig specific load
     switch (input.getType()) {
     case STRING:
+      assert input instanceof MStringInput;
       return fillInputString(prefix, (MStringInput) input, line);
     case INTEGER:
+      assert input instanceof MIntegerInput;
       return fillInputInteger(prefix, (MIntegerInput) input, line);
     case LONG:
+      assert input instanceof MLongInput;
       return fillInputLong(prefix, (MLongInput) input, line);
     case BOOLEAN:
+      assert input instanceof MBooleanInput;
       return fillInputBoolean(prefix, (MBooleanInput) input, line);
     case MAP:
+      assert input instanceof MMapInput;
       return fillInputMap(prefix, (MMapInput) input, line);
     case ENUM:
+      assert input instanceof MEnumInput;
       return fillInputEnum(prefix, (MEnumInput) input, line);
     default:
       println("Unsupported data type " + input.getType());
diff --git a/shell/src/main/java/org/apache/sqoop/shell/utils/JobDynamicConfigOptions.java b/shell/src/main/java/org/apache/sqoop/shell/utils/JobDynamicConfigOptions.java
index 7060d654..2f9ec416 100644
--- a/shell/src/main/java/org/apache/sqoop/shell/utils/JobDynamicConfigOptions.java
+++ b/shell/src/main/java/org/apache/sqoop/shell/utils/JobDynamicConfigOptions.java
@@ -27,6 +27,7 @@
  */
 @SuppressWarnings("serial")
 public class JobDynamicConfigOptions extends DynamicConfigOptions<MJob> {
+  private static final long serialVersionUID = 1L;
 
   @SuppressWarnings("static-access")
   @Override
diff --git a/shell/src/main/java/org/apache/sqoop/shell/utils/LinkDynamicConfigOptions.java b/shell/src/main/java/org/apache/sqoop/shell/utils/LinkDynamicConfigOptions.java
index ef279f7d..c6cc6e4f 100644
--- a/shell/src/main/java/org/apache/sqoop/shell/utils/LinkDynamicConfigOptions.java
+++ b/shell/src/main/java/org/apache/sqoop/shell/utils/LinkDynamicConfigOptions.java
@@ -26,6 +26,7 @@
  */
 @SuppressWarnings("serial")
 public class LinkDynamicConfigOptions extends DynamicConfigOptions<MLink> {
+  private static final long serialVersionUID = 1L;
 
   @SuppressWarnings("static-access")
   @Override
diff --git a/shell/src/main/java/org/apache/sqoop/shell/utils/SubmissionDisplayer.java b/shell/src/main/java/org/apache/sqoop/shell/utils/SubmissionDisplayer.java
index bb0268a2..3a78371a 100644
--- a/shell/src/main/java/org/apache/sqoop/shell/utils/SubmissionDisplayer.java
+++ b/shell/src/main/java/org/apache/sqoop/shell/utils/SubmissionDisplayer.java
@@ -33,13 +33,14 @@
  */
 public final class SubmissionDisplayer {
 
-  private final static SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss z");
+  private final static String DATE_FORMAT = "yyyy-MM-dd HH:mm:ss z";
 
   /**
    * On job submission, displays the initial job info
    * @param submission
    */
   public static void displayHeader(MSubmission submission) {
+    SimpleDateFormat dateFormat = new SimpleDateFormat(DATE_FORMAT);
     println("@|bold "+ resourceString(Constants.RES_SUBMISSION_SUBMISSION_DETAIL) +"|@");
 
     print(resourceString(Constants.RES_SUBMISSION_JOB_ID)+": ");
@@ -84,6 +85,7 @@ public static void displayHeader(MSubmission submission) {
    * @param submission
    */
   public static void displayProgress(MSubmission submission) {
+    SimpleDateFormat dateFormat = new SimpleDateFormat(DATE_FORMAT);
     StringBuilder sb = new StringBuilder();
     if(submission.getStatus().isRunning()) {
       sb.append(dateFormat.format(submission.getLastUpdateDate())+": @|green "+submission.getStatus()+ " |@");
@@ -106,6 +108,7 @@ public static void displayProgress(MSubmission submission) {
    * @param submission
    */
   public static void displayFooter(MSubmission submission) {
+    SimpleDateFormat dateFormat = new SimpleDateFormat(DATE_FORMAT);
     if (submission.getStatus().toString().equals(SubmissionStatus.SUCCEEDED.toString())) {
       println(dateFormat.format(submission.getLastUpdateDate())+": @|green "+submission.getStatus()+ " |@");
       Counters counters = submission.getCounters();