diff --git a/android_app/app/app.iml b/android_app/app/app.iml
index 6477ca1b..4e81a20a 100644
--- a/android_app/app/app.iml
+++ b/android_app/app/app.iml
@@ -76,14 +76,27 @@
       <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/test/shaders" isTestSource="true" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/builds" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-classes" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-runtime-classes" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-safeguard" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-verifier" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/instant-run-resources" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/instant-run-support" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/jniLibs" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifests" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/reload-dex" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/restart-dex" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/shaders" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/split-apk" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/transforms" />
       <excludeFolder url="file://$MODULE_DIR$/build/outputs" />
       <excludeFolder url="file://$MODULE_DIR$/build/tmp" />
     </content>
diff --git a/android_app/app/src/main/java/com/health/openscale/gui/ReminderBootReceiver.java b/android_app/app/src/main/java/com/health/openscale/gui/ReminderBootReceiver.java
index b062cbac..6307430c 100644
--- a/android_app/app/src/main/java/com/health/openscale/gui/ReminderBootReceiver.java
+++ b/android_app/app/src/main/java/com/health/openscale/gui/ReminderBootReceiver.java
@@ -24,6 +24,7 @@ import android.content.Intent;
 import android.content.SharedPreferences;
 import android.preference.PreferenceManager;
 import android.support.v4.app.NotificationCompat;
+import android.util.Log;
 
 import com.health.openscale.R;
 import com.health.openscale.gui.preferences.ReminderPreferences;
@@ -37,6 +38,7 @@ public class ReminderBootReceiver extends BroadcastReceiver
     {
         if (intent.hasExtra(ReminderPreferences.INTENT_EXTRA_ALARM))
         {
+            Log.d(ReminderBootReceiver.class.getSimpleName(), "Received alarm intent");
             SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
 
             String notifyText = prefs.getString(ReminderPreferences.PREFERENCE_KEY_REMINDER_NOTIFY_TEXT,
@@ -59,12 +61,7 @@ public class ReminderBootReceiver extends BroadcastReceiver
             mNotifyMgr.notify(0x01, mBuilder.build());
         }
 
-        if (intent.getAction() != null)
-        {
-            if (intent.getAction().equals(Intent.ACTION_BOOT_COMPLETED))
-            {
-                ReminderPreferences.scheduleAlarms(context);
-            }
-        }
+        if (intent.getAction() != null && intent.getAction().equals(Intent.ACTION_BOOT_COMPLETED))
+            ReminderPreferences.scheduleAlarms(context);
     }
 }
diff --git a/android_app/app/src/main/java/com/health/openscale/gui/preferences/ReminderPreferences.java b/android_app/app/src/main/java/com/health/openscale/gui/preferences/ReminderPreferences.java
index 9a9c3e06..b841bb48 100644
--- a/android_app/app/src/main/java/com/health/openscale/gui/preferences/ReminderPreferences.java
+++ b/android_app/app/src/main/java/com/health/openscale/gui/preferences/ReminderPreferences.java
@@ -31,6 +31,7 @@ import android.preference.Preference;
 import android.preference.PreferenceFragment;
 import android.preference.PreferenceGroup;
 import android.preference.PreferenceManager;
+import android.util.Log;
 
 import com.health.openscale.R;
 import com.health.openscale.gui.ReminderBootReceiver;
@@ -113,8 +114,7 @@ public class ReminderPreferences extends PreferenceFragment
             alarmCal.add(Calendar.DAY_OF_YEAR, 7);
         }
 
-        //Log.d("ReminderPreferences", "Set alarm to " + calendar.getTime());
-
+        Log.d(ReminderPreferences.class.getSimpleName(), "Set alarm to " + alarmCal.getTime());
         AlarmManager alarmMgr = (AlarmManager) context.getSystemService(Context.ALARM_SERVICE);
 
         Intent alarmIntent = new Intent(context, ReminderBootReceiver.class);