diff --git a/astrid/src/com/todoroo/astrid/activity/TaskEditActivity.java b/astrid/src/com/todoroo/astrid/activity/TaskEditActivity.java
index 97e17d0e4..0f8d2881d 100644
--- a/astrid/src/com/todoroo/astrid/activity/TaskEditActivity.java
+++ b/astrid/src/com/todoroo/astrid/activity/TaskEditActivity.java
@@ -793,7 +793,7 @@ public final class TaskEditActivity extends TabActivity {
                     Task.URGENCY_TOMORROW);
             String dayAfterTomorrow = DateUtils.getDayOfWeekString(
                     new Date(DateUtilities.now() + 2 * DateUtilities.ONE_DAY).getDay() +
-                    Calendar.SUNDAY, 0);
+                    Calendar.SUNDAY, DateUtils.FORMAT_ABBREV_ALL);
             urgencyValues[3] = new UrgencyValue(dayAfterTomorrow,
                     Task.URGENCY_DAY_AFTER);
             urgencyValues[4] = new UrgencyValue(labels[4],
diff --git a/astrid/src/com/todoroo/astrid/activity/TaskListActivity.java b/astrid/src/com/todoroo/astrid/activity/TaskListActivity.java
index 2bbba4b56..a574089ca 100644
--- a/astrid/src/com/todoroo/astrid/activity/TaskListActivity.java
+++ b/astrid/src/com/todoroo/astrid/activity/TaskListActivity.java
@@ -78,6 +78,7 @@ import com.todoroo.astrid.reminders.ReminderService;
 import com.todoroo.astrid.reminders.ReminderService.AlarmScheduler;
 import com.todoroo.astrid.rmilk.MilkPreferences;
 import com.todoroo.astrid.service.AddOnService;
+import com.todoroo.astrid.service.AstridDependencyInjector;
 import com.todoroo.astrid.service.MetadataService;
 import com.todoroo.astrid.service.StartupService;
 import com.todoroo.astrid.service.TaskService;
@@ -161,6 +162,10 @@ public class TaskListActivity extends ListActivity implements OnScrollListener,
      * ======================================================= initialization
      * ====================================================================== */
 
+    static {
+        AstridDependencyInjector.initialize();
+    }
+
     public TaskListActivity() {
         DependencyInjectionService.getInstance().inject(this);
     }
diff --git a/astrid/src/com/todoroo/astrid/widget/TasksWidget.java b/astrid/src/com/todoroo/astrid/widget/TasksWidget.java
index 77e024963..3f18083ec 100644
--- a/astrid/src/com/todoroo/astrid/widget/TasksWidget.java
+++ b/astrid/src/com/todoroo/astrid/widget/TasksWidget.java
@@ -51,12 +51,13 @@ public class TasksWidget extends AppWidgetProvider {
             int[] appWidgetIds) {
 
         try {
+            ContextManager.setContext(context);
             super.onUpdate(context, appWidgetManager, appWidgetIds);
 
             // Start in service to prevent Application Not Responding timeout
             updateWidgets(context);
-        } catch (SecurityException e) {
-            // :(
+        } catch (Exception e) {
+            Log.e("astrid-update-widget", "widget update error", e); //$NON-NLS-1$
         }
     }
 
@@ -65,7 +66,7 @@ public class TasksWidget extends AppWidgetProvider {
      * @param id
      */
     public static void updateWidgets(Context context) {
-        context.startService(new Intent(ContextManager.getContext(),
+        context.startService(new Intent(context,
                 TasksWidget.UpdateService.class));
     }