diff --git a/app/src/main/java/emu/skyline/EmulationActivity.kt b/app/src/main/java/emu/skyline/EmulationActivity.kt
index 76fd29b7..a1e5457c 100644
--- a/app/src/main/java/emu/skyline/EmulationActivity.kt
+++ b/app/src/main/java/emu/skyline/EmulationActivity.kt
@@ -189,23 +189,23 @@ class EmulationActivity : AppCompatActivity(), SurfaceHolder.Callback {
     /**
      * This sets [surface] to [holder].surface and passes it into libskyline
      */
-    override fun surfaceCreated(holder : SurfaceHolder?) {
+    override fun surfaceCreated(holder : SurfaceHolder) {
         Log.d("surfaceCreated", "Holder: ${holder.toString()}")
-        surface = holder!!.surface
+        surface = holder.surface
         setSurface(surface)
     }
 
     /**
      * This is purely used for debugging surface changes
      */
-    override fun surfaceChanged(holder : SurfaceHolder?, format : Int, width : Int, height : Int) {
+    override fun surfaceChanged(holder : SurfaceHolder, format : Int, width : Int, height : Int) {
         Log.d("surfaceChanged", "Holder: ${holder.toString()}, Format: $format, Width: $width, Height: $height")
     }
 
     /**
      * This sets [surface] to null and passes it into libskyline
      */
-    override fun surfaceDestroyed(holder : SurfaceHolder?) {
+    override fun surfaceDestroyed(holder : SurfaceHolder) {
         Log.d("surfaceDestroyed", "Holder: ${holder.toString()}")
         surface = null
         setSurface(surface)
diff --git a/app/src/main/java/emu/skyline/loader/RomFile.kt b/app/src/main/java/emu/skyline/loader/RomFile.kt
index fd869a55..ba16ec0f 100644
--- a/app/src/main/java/emu/skyline/loader/RomFile.kt
+++ b/app/src/main/java/emu/skyline/loader/RomFile.kt
@@ -105,7 +105,7 @@ class AppEntry : Serializable {
             output.writeUTF(author)
         output.writeBoolean(icon != null)
         if (icon != null)
-            icon!!.compress(Bitmap.CompressFormat.WEBP, 100, output)
+            icon!!.compress(Bitmap.CompressFormat.WEBP_LOSSY, 100, output)
     }
 
     /**