diff --git a/api/src/org/apache/cloudstack/api/response/SSHKeyPairResponse.java b/api/src/org/apache/cloudstack/api/response/SSHKeyPairResponse.java
index 9121957170e..f494ad2ef4b 100644
--- a/api/src/org/apache/cloudstack/api/response/SSHKeyPairResponse.java
+++ b/api/src/org/apache/cloudstack/api/response/SSHKeyPairResponse.java
@@ -66,14 +66,26 @@ public class SSHKeyPairResponse extends BaseResponse {
         this.fingerprint = fingerprint;
     }
 
+    public String getAccountName() {
+        return accountName;
+    }
+
     public void setAccountName(String accountName) {
         this.accountName = accountName;
     }
 
+    public String getDomainId() {
+        return domainId;
+    }
+
     public void setDomainId(String domainId) {
         this.domainId = domainId;
     }
 
+    public String getDomainName() {
+        return domain;
+    }
+
     public void setDomainName(String domain) {
         this.domain = domain;
     }
diff --git a/server/src/com/cloud/network/rules/RulesManagerImpl.java b/server/src/com/cloud/network/rules/RulesManagerImpl.java
index e3d269dede5..39e0c1b0cea 100644
--- a/server/src/com/cloud/network/rules/RulesManagerImpl.java
+++ b/server/src/com/cloud/network/rules/RulesManagerImpl.java
@@ -1527,7 +1527,7 @@ public class RulesManagerImpl extends ManagerBase implements RulesManager, Rules
             rule.setDisplay(forDisplay);
         }
 
-        if (rule.getSourcePortStart() != rule.getSourcePortEnd() && privatePort != null) {
+        if (!rule.getSourcePortStart().equals(rule.getSourcePortEnd()) && privatePort != null) {
             throw new InvalidParameterValueException("Unable to update the private port of port forwarding rule as  the rule has port range : " + rule.getSourcePortStart() + " to " + rule.getSourcePortEnd());
         }
         if (virtualMachineId == null && vmGuestIp != null) {
diff --git a/server/src/com/cloud/server/ManagementServerImpl.java b/server/src/com/cloud/server/ManagementServerImpl.java
index b525c0ef73a..3f8f52f5852 100644
--- a/server/src/com/cloud/server/ManagementServerImpl.java
+++ b/server/src/com/cloud/server/ManagementServerImpl.java
@@ -3611,11 +3611,8 @@ public class ManagementServerImpl extends ManagerBase implements ManagementServe
         String name = cmd.getName();
         String key = cmd.getPublicKey();
         try {
-            if (key != null) {
-                key = URLDecoder.decode(key, "UTF-8");
-            }
+            key = URLDecoder.decode(key, "UTF-8");
         } catch (UnsupportedEncodingException e) {
-        } finally {
         }
         String publicKey = SSHKeysHelper.getPublicKeyFromKeyMaterial(key);