diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/party/PartyInviteFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/party/PartyInviteFragment.kt
index b7bcd3e08..72f7be3aa 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/party/PartyInviteFragment.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/party/PartyInviteFragment.kt
@@ -161,6 +161,7 @@ fun PartyInviteView(
             }
         }
         items(viewModel.invites.indices.toList()) { index ->
+            if (viewModel.invites.size <= index) return@items
             val invite = viewModel.invites[index]
             val transition = updateTransition(viewModel.invites.size - 1 == index, label = "isLast")
             val rotation = transition.animateFloat(
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/widget/TodosWidgetService.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/widget/TodosWidgetService.kt
index 442c31e76..e1719d205 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/widget/TodosWidgetService.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/widget/TodosWidgetService.kt
@@ -4,8 +4,10 @@ import android.content.Intent
 import android.widget.RemoteViewsService
 import com.habitrpg.android.habitica.data.TaskRepository
 import com.habitrpg.android.habitica.data.UserRepository
+import dagger.hilt.android.AndroidEntryPoint
 import javax.inject.Inject
 
+@AndroidEntryPoint
 class TodosWidgetService : RemoteViewsService() {
 
     @Inject
diff --git a/common/src/main/java/com/habitrpg/common/habitica/extensions/DataBindingUtils.kt b/common/src/main/java/com/habitrpg/common/habitica/extensions/DataBindingUtils.kt
index 6935c508e..c19de6748 100644
--- a/common/src/main/java/com/habitrpg/common/habitica/extensions/DataBindingUtils.kt
+++ b/common/src/main/java/com/habitrpg/common/habitica/extensions/DataBindingUtils.kt
@@ -16,7 +16,6 @@ import com.habitrpg.android.habitica.extensions.setTintWith
 import com.habitrpg.common.habitica.R
 import com.habitrpg.common.habitica.helpers.AppConfigManager
 import com.habitrpg.common.habitica.views.PixelArtView
-import java.util.Collections
 import java.util.Date
 
 fun PixelArtView.loadImage(imageName: String?, imageFormat: String? = null) {
@@ -135,7 +134,7 @@ object DataBindingUtils {
     var configManager: AppConfigManager? = null
 
     init {
-        val tempMap = HashMap<String, String>()
+        val tempMap = mutableMapOf<String, String>()
         tempMap["head_special_1"] = "gif"
         tempMap["broad_armor_special_1"] = "gif"
         tempMap["slim_armor_special_1"] = "gif"
@@ -170,9 +169,10 @@ object DataBindingUtils {
         tempMap["Pet_HatchingPotion_VirtualPet"] = "gif"
         tempMap["Pet-Gryphatrice-Jubilant"] = "gif"
         tempMap["stable_Pet-Gryphatrice-Jubilant"] = "gif"
-        FILEFORMAT_MAP = Collections.unmodifiableMap(tempMap)
+        tempMap["back_special_heroicAureole"] = "gif"
+        FILEFORMAT_MAP = tempMap
 
-        val tempNameMap = HashMap<String, String>()
+        val tempNameMap = mutableMapOf<String, String>()
         tempNameMap["head_special_1"] = "ContributorOnly-Equip-CrystalHelmet"
         tempNameMap["armor_special_1"] = "ContributorOnly-Equip-CrystalArmor"
         tempNameMap["head_special_0"] = "BackerOnly-Equip-ShadeHelmet"
@@ -181,6 +181,6 @@ object DataBindingUtils {
         tempNameMap["weapon_special_0"] = "BackerOnly-Weapon-DarkSoulsBlade"
         tempNameMap["weapon_special_critical"] = "weapon_special_critical"
         tempNameMap["Pet-Wolf-Cerberus"] = "Pet-Wolf-Cerberus"
-        FILENAME_MAP = Collections.unmodifiableMap(tempNameMap)
+        FILENAME_MAP = tempNameMap
     }
 }