diff --git a/astrid/src/com/todoroo/astrid/activity/TaskListActivity.java b/astrid/src/com/todoroo/astrid/activity/TaskListActivity.java
index b6bce37dc..bbb835a16 100644
--- a/astrid/src/com/todoroo/astrid/activity/TaskListActivity.java
+++ b/astrid/src/com/todoroo/astrid/activity/TaskListActivity.java
@@ -400,10 +400,10 @@ public class TaskListActivity extends AstridActivity implements MainMenuListener
 
     @Override
     public void onPageScrolled(int position, float positionOffset,
-            int positionOffsetPixels) {}
+            int positionOffsetPixels) { /* Nothing */ }
 
     @Override
-    public void onPageScrollStateChanged(int state) {}
+    public void onPageScrollStateChanged(int state) { /* Nothing */ }
 
     public void setCommentsCount(int count) {
         TypedValue tv = new TypedValue();
diff --git a/astrid/src/com/todoroo/astrid/activity/TaskListFragment.java b/astrid/src/com/todoroo/astrid/activity/TaskListFragment.java
index 45bed2047..b2fcf7a7e 100644
--- a/astrid/src/com/todoroo/astrid/activity/TaskListFragment.java
+++ b/astrid/src/com/todoroo/astrid/activity/TaskListFragment.java
@@ -336,6 +336,7 @@ public class TaskListFragment extends ListFragment implements OnScrollListener,
             return;
         } else if (extras != null && extras.containsKey(TOKEN_FILTER)) {
             filter = extras.getParcelable(TOKEN_FILTER);
+            extras.remove(TOKEN_FILTER); // Otherwise writing this filter to parcel gives infinite recursion
         } else {
             filter = CoreFilterExposer.buildInboxFilter(getResources());
         }
diff --git a/astrid/src/com/todoroo/astrid/adapter/TaskListFragmentPagerAdapter.java b/astrid/src/com/todoroo/astrid/adapter/TaskListFragmentPagerAdapter.java
index cab6150d6..5569e2cc4 100644
--- a/astrid/src/com/todoroo/astrid/adapter/TaskListFragmentPagerAdapter.java
+++ b/astrid/src/com/todoroo/astrid/adapter/TaskListFragmentPagerAdapter.java
@@ -1,6 +1,7 @@
 package com.todoroo.astrid.adapter;
 
 import android.os.Bundle;
+import android.os.Parcelable;
 import android.support.v4.app.Fragment;
 import android.support.v4.app.FragmentManager;
 import android.support.v4.app.FragmentStatePagerAdapter;
@@ -65,4 +66,9 @@ public class TaskListFragmentPagerAdapter extends FragmentStatePagerAdapter impl
         return extras;
     }
 
+    @Override
+    public Parcelable saveState() {
+        return null; // Don't save state
+    }
+
 }