diff --git a/components/certificate-mgt/org.wso2.carbon.certificate.mgt.cert.admin.api/src/main/java/org/wso2/carbon/certificate/mgt/cert/jaxrs/api/beans/EnrollmentCertificate.java b/components/certificate-mgt/org.wso2.carbon.certificate.mgt.cert.admin.api/src/main/java/org/wso2/carbon/certificate/mgt/cert/jaxrs/api/beans/EnrollmentCertificate.java
index e119746c91..be0bb8edce 100644
--- a/components/certificate-mgt/org.wso2.carbon.certificate.mgt.cert.admin.api/src/main/java/org/wso2/carbon/certificate/mgt/cert/jaxrs/api/beans/EnrollmentCertificate.java
+++ b/components/certificate-mgt/org.wso2.carbon.certificate.mgt.cert.admin.api/src/main/java/org/wso2/carbon/certificate/mgt/cert/jaxrs/api/beans/EnrollmentCertificate.java
@@ -21,15 +21,6 @@ package org.wso2.carbon.certificate.mgt.cert.jaxrs.api.beans;
 public class EnrollmentCertificate {
     String serial;
     String pem;
-    int tenantId;
-
-    public int getTenantId() {
-        return tenantId;
-    }
-
-    public void setTenantId(int tenantId) {
-        this.tenantId = tenantId;
-    }
 
     public String getSerial() {
         return serial;
diff --git a/components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.push.notification.provider.gcm/src/main/java/org/wso2/carbon/device/mgt/extensions/push/notification/provider/gcm/GCMNotificationStrategy.java b/components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.push.notification.provider.gcm/src/main/java/org/wso2/carbon/device/mgt/extensions/push/notification/provider/gcm/GCMNotificationStrategy.java
index af93b692a4..f894e18249 100644
--- a/components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.push.notification.provider.gcm/src/main/java/org/wso2/carbon/device/mgt/extensions/push/notification/provider/gcm/GCMNotificationStrategy.java
+++ b/components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.push.notification.provider.gcm/src/main/java/org/wso2/carbon/device/mgt/extensions/push/notification/provider/gcm/GCMNotificationStrategy.java
@@ -38,7 +38,7 @@ import java.util.List;
 public class GCMNotificationStrategy implements NotificationStrategy {
 
     private static final String GCM_TOKEN = "GCM_TOKEN";
-    private final static String GCM_ENDPOINT = "https://fcm.googleapis.com/fcm/send";
+    private static final String GCM_ENDPOINT = "https://fcm.googleapis.com/fcm/send";
     private static final String GCM_API_KEY = "gcmAPIKey";
     private static final int TIME_TO_LIVE = 60;
     private static final int HTTP_STATUS_CODE_OK = 200;
diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.common/src/main/java/org/wso2/carbon/device/mgt/common/search/Condition.java b/components/device-mgt/org.wso2.carbon.device.mgt.common/src/main/java/org/wso2/carbon/device/mgt/common/search/Condition.java
index 2007a3f121..8483788e9d 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.common/src/main/java/org/wso2/carbon/device/mgt/common/search/Condition.java
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.common/src/main/java/org/wso2/carbon/device/mgt/common/search/Condition.java
@@ -25,7 +25,7 @@ import io.swagger.annotations.ApiModelProperty;
 @ApiModel(value = "Condition", description = "Contains the advance search parameters.")
 public class Condition {
 
-    @ApiModelProperty(name = "conditions", value = "Provide the operation code. You can assign the following operation " +
+    @ApiModelProperty(name = "key", value = "Provide the operation code. You can assign the following operation " +
                                                    "codes:\n" +
                                                    "DEVICE_MODEL : The model of the device.\n" +
                                                    "VENDOR : The name of the device vendor.\n" +