diff --git a/app/src/main/kotlin/com/afollestad/nocknock/adapter/SiteDiffCallback.kt b/app/src/main/kotlin/com/afollestad/nocknock/adapter/SiteDiffCallback.kt
index 2893c0a..de8b7ca 100644
--- a/app/src/main/kotlin/com/afollestad/nocknock/adapter/SiteDiffCallback.kt
+++ b/app/src/main/kotlin/com/afollestad/nocknock/adapter/SiteDiffCallback.kt
@@ -31,10 +31,10 @@ class SiteDiffCallback(
   override fun areItemsTheSame(
     oldItemPosition: Int,
     newItemPosition: Int
-  ) = oldItems[oldItemPosition].id == oldItems[newItemPosition].id
+  ) = oldItems[oldItemPosition].id == newItems[newItemPosition].id
 
   override fun areContentsTheSame(
     oldItemPosition: Int,
     newItemPosition: Int
-  ) = oldItems[oldItemPosition] == oldItems[newItemPosition]
+  ) = oldItems[oldItemPosition] == newItems[newItemPosition]
 }
diff --git a/viewcomponents/src/main/kotlin/com/afollestad/nocknock/viewcomponents/livedata/LiveDataViewExt.kt b/viewcomponents/src/main/kotlin/com/afollestad/nocknock/viewcomponents/livedata/LiveDataViewExt.kt
index 4ca3564..9ab5e1f 100644
--- a/viewcomponents/src/main/kotlin/com/afollestad/nocknock/viewcomponents/livedata/LiveDataViewExt.kt
+++ b/viewcomponents/src/main/kotlin/com/afollestad/nocknock/viewcomponents/livedata/LiveDataViewExt.kt
@@ -47,7 +47,7 @@ inline fun <reified T> EditText.attachLiveData(
     if (data.value != null) {
       this.setText(data.value.toString())
     } else {
-      data.value = this.text.trim().toString().toInt() as T
+      data.value = (this.text.trim().toString().toIntOrNull() ?: 0) as T
     }
   }
   // Out