diff --git a/src/main/AndroidManifest.xml b/src/main/AndroidManifest.xml
index 9328135e8..71cb12d6c 100644
--- a/src/main/AndroidManifest.xml
+++ b/src/main/AndroidManifest.xml
@@ -70,7 +70,7 @@ limitations under the License.
         android:smallScreens="true"
         android:xlargeScreens="true" />
     <application
-        android:name=".InitPreferences"
+        android:name=".Startup"
         android:allowBackup="false"
         android:hardwareAccelerated="true"
         android:icon="@drawable/ic_logo"
diff --git a/src/main/java/de/dennisguse/opentracks/InitPreferences.java b/src/main/java/de/dennisguse/opentracks/InitPreferences.java
deleted file mode 100644
index 798e084ef..000000000
--- a/src/main/java/de/dennisguse/opentracks/InitPreferences.java
+++ /dev/null
@@ -1,15 +0,0 @@
-package de.dennisguse.opentracks;
-
-import android.app.Application;
-
-import de.dennisguse.opentracks.util.PreferencesUtils;
-
-public class InitPreferences extends Application {
-    @Override
-    public void onCreate() {
-        super.onCreate();
-
-        //Set default values of preferences on first start.
-        PreferencesUtils.resetPreferences(this, false);
-    }
-}
diff --git a/src/main/java/de/dennisguse/opentracks/Startup.java b/src/main/java/de/dennisguse/opentracks/Startup.java
new file mode 100644
index 000000000..226e590b1
--- /dev/null
+++ b/src/main/java/de/dennisguse/opentracks/Startup.java
@@ -0,0 +1,37 @@
+package de.dennisguse.opentracks;
+
+import android.app.Application;
+import android.os.StrictMode;
+import android.util.Log;
+
+import de.dennisguse.opentracks.util.PreferencesUtils;
+
+public class Startup extends Application {
+
+    private final static String TAG = Startup.class.getSimpleName();
+
+    @Override
+    public void onCreate() {
+        super.onCreate();
+
+        //Include version information into stack traces.
+        Log.i(TAG, BuildConfig.APPLICATION_ID + "; BuildType: " + BuildConfig.BUILD_TYPE + "; VersionName: " + BuildConfig.VERSION_NAME + " VersionCode: " + BuildConfig.VERSION_CODE);
+
+        //Set default values of preferences on first start.
+        PreferencesUtils.resetPreferences(this, false);
+
+
+        //In debug builds: show thread and VM warnings.
+        if (BuildConfig.DEBUG) {
+            Log.d(TAG, "Enabling strict mode");
+            StrictMode.setThreadPolicy(new StrictMode.ThreadPolicy.Builder()
+                    .detectAll()
+                    .penaltyLog()
+                    .build());
+            StrictMode.setVmPolicy(new StrictMode.VmPolicy.Builder()
+                    .detectAll()
+                    .penaltyLog()
+                    .build());
+        }
+    }
+}
diff --git a/src/main/java/de/dennisguse/opentracks/TrackListActivity.java b/src/main/java/de/dennisguse/opentracks/TrackListActivity.java
index ff3d1865d..9b377ebab 100644
--- a/src/main/java/de/dennisguse/opentracks/TrackListActivity.java
+++ b/src/main/java/de/dennisguse/opentracks/TrackListActivity.java
@@ -248,18 +248,6 @@ public class TrackListActivity extends AbstractListActivity implements ConfirmDe
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
 
-//        if (BuildConfig.DEBUG) {
-//            Log.d(TAG, "Enabling strict mode");
-//            StrictMode.setThreadPolicy(new StrictMode.ThreadPolicy.Builder()
-//                    .detectAll()
-//                    .penaltyLog()
-//                    .build());
-//            StrictMode.setVmPolicy(new StrictMode.VmPolicy.Builder()
-//                    .detectAll()
-//                    .penaltyLog()
-//                    .build());
-//        }
-
         contentProviderUtils = ContentProviderUtils.Factory.get(this);
         sharedPreferences = PreferencesUtils.getSharedPreferences(this);
 
diff --git a/src/main/java/de/dennisguse/opentracks/content/ShareContentProvider.java b/src/main/java/de/dennisguse/opentracks/content/ShareContentProvider.java
index 3cc3e43ce..787a0063a 100644
--- a/src/main/java/de/dennisguse/opentracks/content/ShareContentProvider.java
+++ b/src/main/java/de/dennisguse/opentracks/content/ShareContentProvider.java
@@ -40,7 +40,7 @@ public class ShareContentProvider extends CustomContentProvider implements ICont
 
     private static final String[] COLUMNS = {OpenableColumns.DISPLAY_NAME, OpenableColumns.SIZE};
 
-    public static final String TAG = ShareContentProvider.class.getCanonicalName();
+    public static final String TAG = ShareContentProvider.class.getSimpleName();
 
     private static final int URI_GPX = 0;
     private static final int URI_KML_ONLY = 1;
diff --git a/src/main/java/de/dennisguse/opentracks/util/IntentUtils.java b/src/main/java/de/dennisguse/opentracks/util/IntentUtils.java
index e08ce72cf..fbe3f22f7 100644
--- a/src/main/java/de/dennisguse/opentracks/util/IntentUtils.java
+++ b/src/main/java/de/dennisguse/opentracks/util/IntentUtils.java
@@ -46,7 +46,7 @@ import de.dennisguse.opentracks.io.file.TrackFileFormat;
  */
 public class IntentUtils {
 
-    private final static String TAG = IntentUtils.class.getCanonicalName();
+    private final static String TAG = IntentUtils.class.getSimpleName();
 
     private IntentUtils() {
     }