diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/AmplitudeManager.java b/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/AmplitudeManager.java
index 74a2e09ea..15ab44314 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/AmplitudeManager.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/AmplitudeManager.java
@@ -25,6 +25,7 @@ public class AmplitudeManager {
     }
 
     public static void sendEvent(String eventAction, String eventCategory, String hitType, Map<String, Object> additionalData) {
+        Amplitude.getInstance()
         JSONObject eventProperties = new JSONObject();
         try {
             eventProperties.put("eventAction", eventAction);
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/LoginActivity.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/LoginActivity.java
index ad44a8b99..b569cb328 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/LoginActivity.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/LoginActivity.java
@@ -166,7 +166,7 @@ public class LoginActivity extends BaseActivity
 
         this.isRegistering = true;
 
-        Map<String, String> additionalData = new HashMap<>();
+        Map<String, Object> additionalData = new HashMap<>();
         additionalData.put("page", this.getClass().getSimpleName());
         AmplitudeManager.sendEvent("navigate", AmplitudeManager.EVENT_CATEGORY_NAVIGATION, AmplitudeManager.EVENT_HITTYPE_PAGEVIEW, additionalData);
     }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/SetupActivity.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/SetupActivity.java
index 20a38888c..8957a20e4 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/SetupActivity.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/SetupActivity.java
@@ -36,6 +36,7 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Locale;
 import java.util.Map;
+import java.util.Objects;
 
 import javax.inject.Inject;
 
@@ -75,7 +76,7 @@ public class SetupActivity extends BaseActivity implements View.OnClickListener,
         this.previousButton.setOnClickListener(this);
         this.completedSetup = false;
 
-        Map<String, String> additionalData = new HashMap<>();
+        Map<String, Object> additionalData = new HashMap<>();
         additionalData.put("status", "displayed");
         AmplitudeManager.sendEvent("setup", AmplitudeManager.EVENT_CATEGORY_BEHAVIOUR, AmplitudeManager.EVENT_HITTYPE_EVENT, additionalData);
 
@@ -180,7 +181,7 @@ public class SetupActivity extends BaseActivity implements View.OnClickListener,
         } else if (v == this.previousButton) {
             this.pager.setCurrentItem(this.pager.getCurrentItem() - 1);
         } else if (v == this.skipButton) {
-            Map<String, String> additionalData = new HashMap<>();
+            Map<String, Object> additionalData = new HashMap<>();
             additionalData.put("status", "skipped");
             AmplitudeManager.sendEvent("setup", AmplitudeManager.EVENT_CATEGORY_BEHAVIOUR, AmplitudeManager.EVENT_HITTYPE_EVENT, additionalData);
             this.startMainActivity();
@@ -223,7 +224,7 @@ public class SetupActivity extends BaseActivity implements View.OnClickListener,
             }
         }
 
-        Map<String, String> additionalData = new HashMap<>();
+        Map<String, Object> additionalData = new HashMap<>();
         additionalData.put("status", "completed");
         AmplitudeManager.sendEvent("setup", AmplitudeManager.EVENT_CATEGORY_BEHAVIOUR, AmplitudeManager.EVENT_HITTYPE_EVENT, additionalData);
     }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/BaseFragment.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/BaseFragment.java
index 50d48fd7f..37bc38f56 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/BaseFragment.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/BaseFragment.java
@@ -1,6 +1,13 @@
 package com.habitrpg.android.habitica.ui.fragments;
 
-import com.amplitude.api.Amplitude;
+import android.os.Bundle;
+import android.support.annotation.CallSuper;
+import android.support.annotation.Nullable;
+import android.support.v4.app.DialogFragment;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+
 import com.habitrpg.android.habitica.components.AppComponent;
 import com.habitrpg.android.habitica.events.DisplayTutorialEvent;
 import com.habitrpg.android.habitica.helpers.AmplitudeManager;
@@ -13,16 +20,6 @@ import com.raizlabs.android.dbflow.sql.language.Select;
 
 import org.greenrobot.eventbus.EventBus;
 import org.greenrobot.eventbus.EventBusException;
-import org.json.JSONException;
-import org.json.JSONObject;
-
-import android.os.Bundle;
-import android.support.annotation.CallSuper;
-import android.support.annotation.Nullable;
-import android.support.v4.app.DialogFragment;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
 
 import java.util.Date;
 import java.util.HashMap;
@@ -70,7 +67,7 @@ public abstract class BaseFragment extends DialogFragment {
             String displayedClassName = this.getDisplayedClassName();
 
             if (displayedClassName != null) {
-                Map<String, String> additionalData = new HashMap<>();
+                Map<String, Object> additionalData = new HashMap<>();
                 additionalData.put("page", displayedClassName);
                 AmplitudeManager.sendEvent("navigate", AmplitudeManager.EVENT_CATEGORY_NAVIGATION, AmplitudeManager.EVENT_HITTYPE_PAGEVIEW, additionalData);
             }