diff --git a/astrid/src/com/todoroo/astrid/activity/TaskListActivity.java b/astrid/src/com/todoroo/astrid/activity/TaskListActivity.java
index 1b6ad5dd4..0f9437427 100644
--- a/astrid/src/com/todoroo/astrid/activity/TaskListActivity.java
+++ b/astrid/src/com/todoroo/astrid/activity/TaskListActivity.java
@@ -345,7 +345,6 @@ public class TaskListActivity extends ListFragment implements OnScrollListener,
             overrideFinishAnim = false;
         }
         String intentAction = intent.getAction();
-        // FIXME maybe SEARCH has to go into the Wrapper-activity and forward to the filterFragment
         if (Intent.ACTION_SEARCH.equals(intentAction)) {
             String query = intent.getStringExtra(SearchManager.QUERY).trim();
             Filter searchFilter = new Filter(null, getString(R.string.FLA_search_filter, query),
@@ -1167,7 +1166,7 @@ public class TaskListActivity extends ListFragment implements OnScrollListener,
     private static final String PREF_LAST_AUTO_SYNC = "taskListLastAutoSync"; //$NON-NLS-1$
 
     protected void initiateAutomaticSync() {
-        if (filter.title == null || !filter.title.equals(getString(R.string.BFE_Active)))
+        if (filter == null || filter.title == null || !filter.title.equals(getString(R.string.BFE_Active)))
             return;
 
         long lastAutoSync = Preferences.getLong(PREF_LAST_AUTO_SYNC, 0);
diff --git a/astrid/src/com/todoroo/astrid/ui/ImportanceControlSet.java b/astrid/src/com/todoroo/astrid/ui/ImportanceControlSet.java
index 2ebc0e600..bce5f6f24 100644
--- a/astrid/src/com/todoroo/astrid/ui/ImportanceControlSet.java
+++ b/astrid/src/com/todoroo/astrid/ui/ImportanceControlSet.java
@@ -151,4 +151,4 @@ public class ImportanceControlSet extends TaskEditControlSet {
             task.setValue(Task.IMPORTANCE, getImportance());
         return null;
     }
-}
\ No newline at end of file
+}
diff --git a/facebook/facebook/.classpath b/facebook/facebook/.classpath
index 6c635c01d..a4763d1ee 100644
--- a/facebook/facebook/.classpath
+++ b/facebook/facebook/.classpath
@@ -3,5 +3,6 @@
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="src" path="gen"/>
 	<classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
+	<classpathentry kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/>
 	<classpathentry kind="output" path="bin/classes"/>
 </classpath>
diff --git a/tests/project.properties b/tests/project.properties
index c1fd41ab1..6420eb762 100644
--- a/tests/project.properties
+++ b/tests/project.properties
@@ -11,3 +11,4 @@
 split.density=false
 # Project target.
 target=android-8
+android.library.reference.1=../api