diff --git a/features/device-mgt-iot-raspberrypi-feature/org.wso2.carbon.device.mgt.iot.raspberrypi.feature/src/main/resources/agent/src/RaspberryAgent.py b/features/device-mgt-iot-raspberrypi-feature/org.wso2.carbon.device.mgt.iot.raspberrypi.feature/src/main/resources/agent/src/RaspberryAgent.py
index 8242db1bbd..8e502fa251 100755
--- a/features/device-mgt-iot-raspberrypi-feature/org.wso2.carbon.device.mgt.iot.raspberrypi.feature/src/main/resources/agent/src/RaspberryAgent.py
+++ b/features/device-mgt-iot-raspberrypi-feature/org.wso2.carbon.device.mgt.iot.raspberrypi.feature/src/main/resources/agent/src/RaspberryAgent.py
@@ -73,7 +73,7 @@ if args.mode:
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 #       Endpoint specific settings to which the data is pushed
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-DC_ENDPOINT = iotUtils.APIM_EP.split(":")
+DC_ENDPOINT = iotUtils.HTTPS_EP.split(":")
 DC_IP = DC_ENDPOINT[1].replace('//', '')
 DC_PORT = int(DC_ENDPOINT[2])
 DC_ENDPOINT_CONTEXT = iotUtils.CONTROLLER_CONTEXT
@@ -124,8 +124,7 @@ def configureLogger(loggerName):
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 def registerDeviceIP():
     dcConncection = httplib.HTTPSConnection(host=DC_IP, port=DC_PORT)
-    #dcConncection = httplib.HTTPConnection(DC_IP, DC_PORT)
-
+    #TODO need to get server certificate when initializing https connection
     dcConncection.set_debuglevel(1)
     dcConncection.connect()
 
diff --git a/features/device-mgt-iot-raspberrypi-feature/org.wso2.carbon.device.mgt.iot.raspberrypi.feature/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.raspberrypi.type-view/type-view.hbs b/features/device-mgt-iot-raspberrypi-feature/org.wso2.carbon.device.mgt.iot.raspberrypi.feature/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.raspberrypi.type-view/type-view.hbs
index 719eb2aba2..d30e896d95 100644
--- a/features/device-mgt-iot-raspberrypi-feature/org.wso2.carbon.device.mgt.iot.raspberrypi.feature/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.raspberrypi.type-view/type-view.hbs
+++ b/features/device-mgt-iot-raspberrypi-feature/org.wso2.carbon.device.mgt.iot.raspberrypi.feature/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.raspberrypi.type-view/type-view.hbs
@@ -177,9 +177,9 @@
     <h3 class="uppercase">Connect (Quick Start)</h3><hr>
     <p class="grey margin-top">Internet of Things Foundation Quickstart connection</p>
     <ul class="list-unstyled">
-        <li class="padding-top-double"><span class="circle">01</span> Click on the <i>'Create DEB'</i> button above to
+        <li class="padding-top-double"><span class="circle">01</span> Click on the <i>'Download'</i> button above to
             get the download link for the Raspberry Pi setup files</li>
-        <li class="padding-top-double"><span class="circle">02</span> <b>testAgent.sh</b>: his script is used to run
+        <li class="padding-top-double"><span class="circle">02</span> <b>testAgent.sh</b>: This script is used to run
             this service in a testing environment. It can be run on a real Raspberry Pi device or in a
             virtual environment.<br>To run: sudo ./testAgent.sh and follow the instructions.</li>
         <li class="padding-top-double"><span class="circle">03</span> <b>startService.sh</b>: After testing, this script