diff --git a/Habitica/AndroidManifest.xml b/Habitica/AndroidManifest.xml
index 4c370eb43..e0552226e 100644
--- a/Habitica/AndroidManifest.xml
+++ b/Habitica/AndroidManifest.xml
@@ -2,7 +2,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     package="com.habitrpg.android.habitica"
-    android:versionCode="1908"
+    android:versionCode="1909"
     android:versionName="1.1.1"
     android:screenOrientation="portrait"
     android:installLocation="auto" >
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/ApiClientImpl.java b/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/ApiClientImpl.java
index 3a0a87222..a706d0f3f 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/ApiClientImpl.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/ApiClientImpl.java
@@ -162,6 +162,7 @@ public class ApiClientImpl implements Action1<Throwable>, ApiClient {
         this.context = context;
         this.crashlyticsProxy = crashlyticsProxy;
         this.popupNotificationsManager = popupNotificationsManager;
+        this.popupNotificationsManager.setApiClient(this);
 
         HabiticaBaseApplication.getComponent().inject(this);
         crashlyticsProxy.setUserIdentifier(this.hostConfig.getUser());
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/TaskRepositoryImpl.java b/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/TaskRepositoryImpl.java
index e4b539468..d700ff5c3 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/TaskRepositoryImpl.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/TaskRepositoryImpl.java
@@ -236,7 +236,7 @@ public class TaskRepositoryImpl extends BaseRepositoryImpl<TaskLocalRepository>
 
     @Override
     public Observable<TaskList> updateDailiesIsDue(Date date) {
-        DateFormat formatter = new SimpleDateFormat("YYYY-MM-dd", Locale.US);
+        DateFormat formatter = new SimpleDateFormat("yyyy-MM-dd", Locale.US);
         return apiClient.getTasks("dailys", formatter.format(date))
                 .doOnNext(localRepository::updateIsdue);
     }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/UserRepositoryImpl.java b/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/UserRepositoryImpl.java
index cc7dd22cb..b969c68cd 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/UserRepositoryImpl.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/UserRepositoryImpl.java
@@ -80,7 +80,11 @@ public class UserRepositoryImpl extends BaseRepositoryImpl<UserLocalRepository>
             lastSync = new Date();
             return apiClient.retrieveUser(withTasks)
                     .doOnNext(localRepository::saveUser)
-                    .doOnNext(user -> taskRepository.saveTasks(user.getId(), user.getTasksOrder(), user.tasks))
+                    .doOnNext(user -> {
+                        if (withTasks) {
+                            taskRepository.saveTasks(user.getId(), user.getTasksOrder(), user.tasks);
+                        }
+                    })
                     .flatMap(user -> {
                         Calendar calendar = new GregorianCalendar();
                         TimeZone timeZone = calendar.getTimeZone();
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/interactors/NotifyUserUseCase.java b/Habitica/src/main/java/com/habitrpg/android/habitica/interactors/NotifyUserUseCase.java
index dae06d705..d89b85886 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/interactors/NotifyUserUseCase.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/interactors/NotifyUserUseCase.java
@@ -77,7 +77,7 @@ public class NotifyUserUseCase extends UseCase<NotifyUserUseCase.RequestValues,
             builder.append(" Gold");
         }
         if (mp > 0) {
-            builder.append(" + ").append(String.valueOf(round(mp, 2))).append(" Magic");
+            builder.append(" + ").append(String.valueOf(round(mp, 2))).append(" Mana");
         }
 
         return new Pair<>(builder, displayType);
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/SkillTasksActivity.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/SkillTasksActivity.java
index 5a3b38a80..cede640aa 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/SkillTasksActivity.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/SkillTasksActivity.java
@@ -69,7 +69,7 @@ public class SkillTasksActivity extends BaseActivity {
                         fragment.taskType = Task.TYPE_DAILY;
                         break;
                     default:
-                        fragment.taskType = Task.TYPE_REWARD;
+                        fragment.taskType = Task.TYPE_TODO;
                 }
 
                 compositeSubscription.add(fragment.getTaskSelectionEvents().subscribe(task -> taskSelected(task), RxErrorHandler.handleEmptyError()));