diff --git a/res/values/strings.xml b/res/values/strings.xml
index 97f2af3..42ae4f0 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -1775,11 +1775,11 @@
     <string name="wallpaper_settings_fragment_title">Choose wallpaper from</string>
     <!-- Display settings screen, trigger for screen saver options -->
     <string name="screensaver_settings_title">Daydream</string>
-    <!-- Display settings screen, summary fragment for screen saver options, activated on sleep or docked -->
+    <!-- Display settings screen, summary fragment for screen saver options, activated when docked or asleep and charging -->
     <string name="screensaver_settings_summary_either_long">When docked or asleep and charging</string>
-    <!-- Dream settings screen, dialog option, activated on sleep or docked -->
+    <!-- Dream settings screen, dialog option, activated when docked or asleep and charging -->
     <string name="screensaver_settings_summary_either_short">Either</string>
-    <!-- Display settings screen, summary fragment for screen saver options, activated on sleep -->
+    <!-- Display settings screen, summary fragment for screen saver options, activated when asleep and charging -->
     <string name="screensaver_settings_summary_sleep">While charging</string>
     <!-- Display settings screen, summary fragment for screen saver options, activated when docked  -->
     <string name="screensaver_settings_summary_dock">While docked</string>
diff --git a/src/com/android/settings/AppWidgetLoader.java b/src/com/android/settings/AppWidgetLoader.java
index 9155e60..985ef8b 100644
--- a/src/com/android/settings/AppWidgetLoader.java
+++ b/src/com/android/settings/AppWidgetLoader.java
@@ -176,7 +176,8 @@
      * Create list entries for installed {@link AppWidgetProviderInfo} widgets.
      */
     void putInstalledAppWidgets(List<Item> items, int categoryFilter) {
-        List<AppWidgetProviderInfo> installed = mAppWidgetManager.getInstalledProviders();
+        List<AppWidgetProviderInfo> installed =
+                mAppWidgetManager.getInstalledProviders(categoryFilter);
         putAppWidgetItems(installed, null, items, categoryFilter, false);
     }
 }
diff --git a/src/com/android/settings/Utils.java b/src/com/android/settings/Utils.java
index 6d76bed..2ce77b5 100644
--- a/src/com/android/settings/Utils.java
+++ b/src/com/android/settings/Utils.java
@@ -295,7 +295,7 @@
         }
 
         // Did not find a matching activity, so remove the preference
-        if (target.remove(header)) System.err.println("Removed " + header.id);
+        target.remove(header);
 
         return false;
     }