diff --git a/app/build.gradle b/app/build.gradle
index 243eebc..22a5a73 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -17,6 +17,12 @@ android {
         versionCode 1
         versionName "1.0"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
+        
+        javaCompileOptions {
+            annotationProcessorOptions {
+                arguments = ["room.schemaLocation": "$projectDir/schemas".toString()]
+            }
+        }
     }
     buildTypes {
         release {
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 0b5bca0..5d1d9e4 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -14,6 +14,7 @@
         android:label="@string/app_name"
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
+        android:usesCleartextTraffic="true"
         android:theme="@style/AppTheme"
         tools:ignore="GoogleAppIndexingWarning">
         <activity android:name=".ui.MainActivity">
@@ -25,4 +26,4 @@
         </activity>
     </application>
 
-</manifest>
\ No newline at end of file
+</manifest>
diff --git a/app/src/main/java/com/resocoder/forecastmvvm/data/db/CurrentWeatherDao.kt b/app/src/main/java/com/resocoder/forecastmvvm/data/db/CurrentWeatherDao.kt
index 97cf21a..3a63f17 100644
--- a/app/src/main/java/com/resocoder/forecastmvvm/data/db/CurrentWeatherDao.kt
+++ b/app/src/main/java/com/resocoder/forecastmvvm/data/db/CurrentWeatherDao.kt
@@ -16,9 +16,11 @@ interface CurrentWeatherDao {
     @Insert(onConflict = OnConflictStrategy.REPLACE)
     fun upsert(weatherEntry: CurrentWeatherEntry)
 
+    @SuppressWarnings(RoomWarnings.CURSOR_MISMATCH)
     @Query("select * from current_weather where id = $CURRENT_WEATHER_ID")
     fun getWeatherMetric(): LiveData<MetricCurrentWeatherEntry>
 
+    @SuppressWarnings(RoomWarnings.CURSOR_MISMATCH)
     @Query("select * from current_weather where id = $CURRENT_WEATHER_ID")
     fun getWeatherImperial(): LiveData<ImperialCurrentWeatherEntry>
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/com/resocoder/forecastmvvm/ui/MainActivity.kt b/app/src/main/java/com/resocoder/forecastmvvm/ui/MainActivity.kt
index 54f0d6a..7b2982c 100644
--- a/app/src/main/java/com/resocoder/forecastmvvm/ui/MainActivity.kt
+++ b/app/src/main/java/com/resocoder/forecastmvvm/ui/MainActivity.kt
@@ -63,7 +63,7 @@ class MainActivity : AppCompatActivity(), KodeinAware {
     }
 
     override fun onSupportNavigateUp(): Boolean {
-        return NavigationUI.navigateUp(null, navController)
+        return NavigationUI.navigateUp(navController,null)
     }
 
     private fun requestLocationPermission() {