diff --git a/ClientLib/mobile/libs/AidlLib.jar b/ClientLib/mobile/libs/AidlLib.jar
index b17a554d2a..9e2aef6cd1 100644
Binary files a/ClientLib/mobile/libs/AidlLib.jar and b/ClientLib/mobile/libs/AidlLib.jar differ
diff --git a/ServiceApp/src/org/droidplanner/services/android/api/DroneApi.java b/ServiceApp/src/org/droidplanner/services/android/api/DroneApi.java
index a577810612..7c04fa4e31 100644
--- a/ServiceApp/src/org/droidplanner/services/android/api/DroneApi.java
+++ b/ServiceApp/src/org/droidplanner/services/android/api/DroneApi.java
@@ -853,10 +853,8 @@ public void buildComplexMissionItem(Bundle itemBundle) {
     }
 
     private Survey buildSurvey(Survey survey) {
-        if (droneMgr == null)
-            return survey;
-
-        org.droidplanner.core.mission.Mission droneMission = this.droneMgr.getDrone().getMission();
+        org.droidplanner.core.mission.Mission droneMission = droneMgr == null ? null
+                : this.droneMgr.getDrone().getMission();
         org.droidplanner.core.mission.survey.Survey updatedSurvey = (org.droidplanner.core.mission.survey.Survey) ProxyUtils.getMissionItemImpl
                 (droneMission, survey);
 
@@ -864,10 +862,8 @@ private Survey buildSurvey(Survey survey) {
     }
 
     private StructureScanner buildStructureScanner(StructureScanner item) {
-        if (droneMgr == null)
-            return item;
-
-        org.droidplanner.core.mission.Mission droneMission = this.droneMgr.getDrone().getMission();
+        org.droidplanner.core.mission.Mission droneMission = droneMgr == null ? null
+        : this.droneMgr.getDrone().getMission();
         org.droidplanner.core.mission.waypoints.StructureScanner updatedScan = (org.droidplanner.core.mission.waypoints.StructureScanner) ProxyUtils
                 .getMissionItemImpl(droneMission, item);
 
diff --git a/ServiceApp/src/org/droidplanner/services/android/communication/service/UploaderService.java b/ServiceApp/src/org/droidplanner/services/android/communication/service/UploaderService.java
index 9ad3042825..74a4aecbd7 100644
--- a/ServiceApp/src/org/droidplanner/services/android/communication/service/UploaderService.java
+++ b/ServiceApp/src/org/droidplanner/services/android/communication/service/UploaderService.java
@@ -152,7 +152,7 @@ protected void onHandleIntent(Intent intent) {
 	private NotificationCompat.Builder generateNotificationBuilder() {
 		return new NotificationCompat.Builder(getApplicationContext())
 				.setContentTitle(getString(R.string.uploader_notification_title))
-				.setSmallIcon(R.drawable.ic_launcher)
+				.setSmallIcon(R.drawable.ic_stat_notify)
 				// .setProgress(fileSize, 0, false)
 				.setAutoCancel(true).setPriority(NotificationCompat.PRIORITY_HIGH);
 	}