diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.mobile.impl/src/main/java/org/wso2/carbon/device/mgt/mobile/impl/android/AndroidDeviceManager.java b/components/device-mgt/org.wso2.carbon.device.mgt.mobile.impl/src/main/java/org/wso2/carbon/device/mgt/mobile/impl/android/AndroidDeviceManager.java
index a176e23f1..119a45217 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.mobile.impl/src/main/java/org/wso2/carbon/device/mgt/mobile/impl/android/AndroidDeviceManager.java
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.mobile.impl/src/main/java/org/wso2/carbon/device/mgt/mobile/impl/android/AndroidDeviceManager.java
@@ -161,7 +161,6 @@ public class AndroidDeviceManager implements DeviceManager {
 			}
 			String msg =
 					"Error while enrolling the Android device : " + device.getDeviceIdentifier();
-			log.error(msg, e);
 			throw new DeviceManagementException(msg, e);
 		}
 		return status;
@@ -188,7 +187,6 @@ public class AndroidDeviceManager implements DeviceManager {
 			}
 			String msg = "Error while updating the enrollment of the Android device : " +
 			             device.getDeviceIdentifier();
-			log.error(msg, e);
 			throw new DeviceManagementException(msg, e);
 		}
 		return status;
@@ -213,7 +211,6 @@ public class AndroidDeviceManager implements DeviceManager {
 				log.warn(msg, mobileDAOEx);
 			}
 			String msg = "Error while removing the Android device : " + deviceId.getId();
-			log.error(msg, e);
 			throw new DeviceManagementException(msg, e);
 		}
 		return status;
@@ -234,7 +231,6 @@ public class AndroidDeviceManager implements DeviceManager {
 		} catch (MobileDeviceManagementDAOException e) {
 			String msg = "Error while checking the enrollment status of Android device : " +
 			             deviceId.getId();
-			log.error(msg, e);
 			throw new DeviceManagementException(msg, e);
 		}
 		return isEnrolled;
diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.mobile.impl/src/main/java/org/wso2/carbon/device/mgt/mobile/impl/android/AndroidPolicyMonitoringService.java b/components/device-mgt/org.wso2.carbon.device.mgt.mobile.impl/src/main/java/org/wso2/carbon/device/mgt/mobile/impl/android/AndroidPolicyMonitoringService.java
index acc7337c2..3c58c0c6e 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.mobile.impl/src/main/java/org/wso2/carbon/device/mgt/mobile/impl/android/AndroidPolicyMonitoringService.java
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.mobile.impl/src/main/java/org/wso2/carbon/device/mgt/mobile/impl/android/AndroidPolicyMonitoringService.java
@@ -72,7 +72,7 @@ public class AndroidPolicyMonitoringService implements PolicyMonitoringService {
         complianceData.setComplianceFeatures(complianceFeatures);
 
         for (ComplianceFeature cf : complianceFeatures) {
-            if (!cf.isCompliance()) {
+            if (!cf.isCompliant()) {
                 complianceData.setStatus(false);
                 break;
             }
diff --git a/features/device-mgt/org.wso2.carbon.device.mgt.mobile.feature/src/main/resources/dbscripts/plugins/h2_ios.sql b/features/device-mgt/org.wso2.carbon.device.mgt.mobile.feature/src/main/resources/dbscripts/plugins/h2_ios.sql
index c90227a65..52f30b57e 100644
--- a/features/device-mgt/org.wso2.carbon.device.mgt.mobile.feature/src/main/resources/dbscripts/plugins/h2_ios.sql
+++ b/features/device-mgt/org.wso2.carbon.device.mgt.mobile.feature/src/main/resources/dbscripts/plugins/h2_ios.sql
@@ -15,21 +15,21 @@ CREATE TABLE IF NOT EXISTS `IOS_FEATURE` (
 
   CREATE  TABLE IF NOT EXISTS `IOS_DEVICE` (
   `MOBILE_DEVICE_ID` VARCHAR(45) NOT NULL,
-  `APNS_PUSH_TOKEN` VARCHAR(100) NULL DEFAULT NULL,
-  `MAGIC_TOKEN` VARCHAR(100) NULL DEFAULT NULL,
-  `MDM_TOKEN` VARCHAR(100) NULL DEFAULT NULL,
-  `UNLOCK_TOKEN` VARCHAR(2000) NULL DEFAULT NULL,
-  `CHALLENGE_TOKEN` VARCHAR(45) NULL DEFAULT NULL,
-  `DEVICE_INFO` VARCHAR(8000) NULL DEFAULT NULL,
-  `SERIAL` VARCHAR(45) NULL DEFAULT NULL,
-  `PRODUCT` VARCHAR(45) NULL DEFAULT NULL,
-  `IMEI` VARCHAR(45) NULL DEFAULT NULL,
-  `VERSION` VARCHAR(45) NULL DEFAULT NULL,
-  `MAC_ADDRESS` VARCHAR(45) NULL DEFAULT NULL,
-  `DEVICE_NAME` VARCHAR(100) NULL DEFAULT NULL,
-  `ICCID` VARCHAR(45) NULL DEFAULT NULL,
-  `LATITUDE` VARCHAR(45) NULL DEFAULT NULL,
-  `LONGITUDE` VARCHAR(45) NULL DEFAULT NULL,
+  `APNS_PUSH_TOKEN` VARCHAR(100) DEFAULT NULL,
+  `MAGIC_TOKEN` VARCHAR(100) DEFAULT NULL,
+  `MDM_TOKEN` VARCHAR(100) DEFAULT NULL,
+  `UNLOCK_TOKEN` VARCHAR(2000) DEFAULT NULL,
+  `CHALLENGE_TOKEN` VARCHAR(45) DEFAULT NULL,
+  `DEVICE_INFO` VARCHAR(8000) DEFAULT NULL,
+  `SERIAL` VARCHAR(45) DEFAULT NULL,
+  `PRODUCT` VARCHAR(45) DEFAULT NULL,
+  `IMEI` VARCHAR(45) DEFAULT NULL,
+  `VERSION` VARCHAR(45) DEFAULT NULL,
+  `MAC_ADDRESS` VARCHAR(45) DEFAULT NULL,
+  `DEVICE_NAME` VARCHAR(100) DEFAULT NULL,
+  `ICCID` VARCHAR(45) DEFAULT NULL,
+  `LATITUDE` VARCHAR(45) DEFAULT NULL,
+  `LONGITUDE` VARCHAR(45) DEFAULT NULL,
   PRIMARY KEY (`MOBILE_DEVICE_ID`) );