diff --git a/manifest.xml b/manifest.xml
index 6c011ed..3f2a12b 100644
--- a/manifest.xml
+++ b/manifest.xml
@@ -21,7 +21,7 @@
     Use "Monkey C: Edit Application" from the Visual Studio Code command palette
     to update the application attributes.
   -->
-  <iq:application id="98c36259-498a-4458-9cef-74a273ad2bc3" type="watch-app" name="@Strings.AppName" entry="HomeAssistantApp" launcherIcon="@Drawables.LauncherIcon" minApiLevel="3.1.0">
+  <iq:application id="40131e87-31ff-454b-a8e2-92276ee399d6" type="watch-app" name="@Strings.AppName" entry="HomeAssistantApp" launcherIcon="@Drawables.LauncherIcon" minApiLevel="3.1.0">
     <!--
       Use the following from the Visual Studio Code comand palette to edit
       the build targets:
diff --git a/source/HomeAssistantToggleMenuItem.mc b/source/HomeAssistantToggleMenuItem.mc
index a92537f..9bbbe89 100644
--- a/source/HomeAssistantToggleMenuItem.mc
+++ b/source/HomeAssistantToggleMenuItem.mc
@@ -131,7 +131,6 @@ class HomeAssistantToggleMenuItem extends WatchUi.ToggleMenuItem {
         if (keepUpdating) {
             // Now this feels very "closely coupled" to the application, but it is the most reliable method instead of using a timer.
             getApp().updateNextMenuItem();
-            System.println("HomeAssistantToggleMenuItem onReturnGetState(): Updated " + mIdentifier);
         }
     }
 
diff --git a/source/HomeAssistantView.mc b/source/HomeAssistantView.mc
index 51f9919..d8308de 100644
--- a/source/HomeAssistantView.mc
+++ b/source/HomeAssistantView.mc
@@ -74,10 +74,8 @@ class HomeAssistantView extends WatchUi.Menu2 {
         var lmi = mListMenuItems as Lang.Array<WatchUi.MenuItem>;
         for(var i = 0; i < mListMenuItems.size(); i++) {
             var item = lmi[i];
-            if (item instanceof HomeAssistantViewMenuItem) {
+            if (item instanceof HomeAssistantViewMenuItem || item instanceof HomeAssistantViewIconMenuItem) {
                 fullList.addAll(item.getMenuView().getItemsToUpdate()); 
-            } else if (item instanceof HomeAssistantViewIconMenuItem) {
-                fullList.addAll(item.getMenuView().getItemsToUpdate());
             }
         }