diff --git a/app/res/layout/account_row.xml b/app/res/layout/account_row.xml
index 750c81171..7732c9043 100644
--- a/app/res/layout/account_row.xml
+++ b/app/res/layout/account_row.xml
@@ -52,7 +52,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:id="@+id/account_list_icon_text"
-                android:textSize="20dp"
+                android:textSize="20sp"
                 android:textStyle="bold"
                 android:textColor="#ffffffff"
                 android:layout_gravity="center"/>
diff --git a/app/res/layout/history_row.xml b/app/res/layout/history_row.xml
index 59383954b..b35463882 100644
--- a/app/res/layout/history_row.xml
+++ b/app/res/layout/history_row.xml
@@ -39,7 +39,8 @@
             android:id="@+id/history_list_emblem"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginRight="8dp" />
+            android:layout_marginRight="8dp"
+            android:contentDescription="@string/Sport"/>
 
         <TextView
             android:id="@+id/history_list_distance"
diff --git a/app/res/layout/step_button.xml b/app/res/layout/step_button.xml
index 4227ce5ea..df1af1997 100644
--- a/app/res/layout/step_button.xml
+++ b/app/res/layout/step_button.xml
@@ -42,7 +42,8 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginLeft="8dp"
-        android:layout_marginRight="0dp" />
+        android:layout_marginRight="0dp"
+        android:contentDescription="@string/Edit_step" />
 
     <TextView
         android:id="@+id/step_goal_value"
diff --git a/app/src/org/runnerup/export/SyncManager.java b/app/src/org/runnerup/export/SyncManager.java
index ed16b6c83..aab517abb 100644
--- a/app/src/org/runnerup/export/SyncManager.java
+++ b/app/src/org/runnerup/export/SyncManager.java
@@ -20,6 +20,7 @@
 import android.Manifest;
 import android.annotation.SuppressLint;
 import android.app.Activity;
+import android.support.v4.util.LongSparseArray;
 import android.support.v7.app.AlertDialog;
 import android.app.ProgressDialog;
 import android.content.ContentValues;
@@ -88,7 +89,7 @@ public class SyncManager {
     private Activity mActivity = null;
     private Context mContext = null;
     private final Map<String, Synchronizer> synchronizers = new HashMap<>();
-    private final Map<Long, Synchronizer> synchronizersById = new HashMap<>();
+    private final LongSparseArray<Synchronizer> synchronizersById = new LongSparseArray<>();
 
     private ProgressDialog mSpinner = null;
 
diff --git a/gradle.properties b/gradle.properties
index 88528e594..2802511be 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1 +1,2 @@
+android.enableD8.desugaring=false
 android.enableR8=false