diff --git a/twidere.component.common/src/main/java/org/mariotaku/twidere/model/ParcelableStatus.java b/twidere.component.common/src/main/java/org/mariotaku/twidere/model/ParcelableStatus.java
index b938f8ad1..aa386736c 100644
--- a/twidere.component.common/src/main/java/org/mariotaku/twidere/model/ParcelableStatus.java
+++ b/twidere.component.common/src/main/java/org/mariotaku/twidere/model/ParcelableStatus.java
@@ -42,6 +42,8 @@ import org.mariotaku.twidere.provider.TwidereDataStore;
 import org.mariotaku.twidere.provider.TwidereDataStore.Statuses;
 
 import java.io.IOException;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
 import java.util.Arrays;
 import java.util.Comparator;
 
@@ -576,6 +578,7 @@ public class ParcelableStatus implements Parcelable, Comparable<ParcelableStatus
             FilterFlags.BLOCKED_BY_USER,
             FilterFlags.POSSIBILITY_SENSITIVE
     }, flag = true)
+    @Retention(RetentionPolicy.SOURCE)
     public @interface FilterFlags {
         /**
          * Original tweet of a quote tweet is unavailable.
diff --git a/twidere/src/androidTest/kotlin/org/mariotaku/twidere/util/TwidereArrayUtilsTest.kt b/twidere/src/androidTest/kotlin/org/mariotaku/twidere/util/TwidereArrayUtilsTest.kt
index 864a8e044..70a3312ff 100644
--- a/twidere/src/androidTest/kotlin/org/mariotaku/twidere/util/TwidereArrayUtilsTest.kt
+++ b/twidere/src/androidTest/kotlin/org/mariotaku/twidere/util/TwidereArrayUtilsTest.kt
@@ -1,11 +1,9 @@
 package org.mariotaku.twidere.util
 
 
+import org.junit.Assert
 import org.junit.Test
 
-import junit.framework.Assert.assertEquals
-import org.junit.Assert.assertArrayEquals
-
 /**
  * Created by mariotaku on 16/1/31.
  */
@@ -23,7 +21,7 @@ class TwidereArrayUtilsTest {
         //noinspection ConstantConditions
         TwidereArrayUtils.mergeArray(merged, array1, array2, array3)
         val expected = arrayOf("1", "2", "1", "2")
-        assertArrayEquals(expected, merged)
+        Assert.assertArrayEquals(expected, merged)
     }
 
     @Test
@@ -33,7 +31,7 @@ class TwidereArrayUtilsTest {
         val array2 = arrayOf("1", "2")
         val array3: Array<String>? = null
         //noinspection ConstantConditions
-        assertEquals(4, TwidereArrayUtils.arraysLength(array1, array2, array3))
-        assertEquals(6, TwidereArrayUtils.arraysLength(array1, array2, array2))
+        Assert.assertEquals(4, TwidereArrayUtils.arraysLength(array1, array2, array3))
+        Assert.assertEquals(6, TwidereArrayUtils.arraysLength(array1, array2, array2))
     }
 }
\ No newline at end of file
diff --git a/twidere/src/fdroid/kotlin/org/mariotaku/twidere/fragment/OpenStreetMapViewerFragment.kt b/twidere/src/fdroid/kotlin/org/mariotaku/twidere/fragment/OpenStreetMapViewerFragment.kt
index 2aa6a3d45..ff953e752 100644
--- a/twidere/src/fdroid/kotlin/org/mariotaku/twidere/fragment/OpenStreetMapViewerFragment.kt
+++ b/twidere/src/fdroid/kotlin/org/mariotaku/twidere/fragment/OpenStreetMapViewerFragment.kt
@@ -35,7 +35,7 @@ import org.osmdroid.views.overlay.ItemizedOverlay
 import org.osmdroid.views.overlay.OverlayItem
 import java.util.*
 
-class OpenStreetMapViewerFragment : BaseSupportFragment(), Constants {
+class OpenStreetMapViewerFragment : BaseFragment(), Constants {
 
     private var latitude: Double = 0.0
     private var longitude: Double = 0.0