diff --git a/app/controllers/todos_controller.rb b/app/controllers/todos_controller.rb
index 2bdb06c5..df7df3cd 100644
--- a/app/controllers/todos_controller.rb
+++ b/app/controllers/todos_controller.rb
@@ -573,7 +573,7 @@ class TodosController < ApplicationController
     @source_view = 'deferred'
     @page_title = t('todos.deferred_tasks_title')
 
-    @contexts_to_show = @contexts = current_user.contexts.find(:all)
+    @contexts_to_show = @contexts = current_user.contexts
 
     includes = params[:format]=='xml' ? [:context, :project] : Todo::DEFAULT_INCLUDES
 
diff --git a/app/views/projects/edit.js.erb b/app/views/projects/edit.js.erb
index c13641d2..3df90048 100644
--- a/app/views/projects/edit.js.erb
+++ b/app/views/projects/edit.js.erb
@@ -1,8 +1,8 @@
 <%
   selector_edit = "div##{dom_id(@project, 'edit')}"
-  selector_edit = "div.project-edit-current " + selector unless @source_view="project"
+  selector_edit = "div.project-edit-current " + selector_edit unless @source_view=="project"
   selector_project = "div##{dom_id(@project)}"
-  selector_project = "div.project-edit-current " + selector unless @source_view="project"
+  selector_project = "div.project-edit-current " + selector_project unless @source_view=="project"
 -%>
 
 function html_for_edit_form() {
diff --git a/features/step_definitions/recurring_todo_steps.rb b/features/step_definitions/recurring_todo_steps.rb
index 46739fba..8d37ec71 100644
--- a/features/step_definitions/recurring_todo_steps.rb
+++ b/features/step_definitions/recurring_todo_steps.rb
@@ -73,6 +73,8 @@ When /^I mark the pattern "([^"]*)" as (complete|active)$/ do |pattern_name, sta
   pattern.should_not be_nil
   pattern.completed?.should(state=="complete" ? be_false : be_true)
   page.find("#check_#{pattern.id}").click
+  wait_for_ajax
+  wait_for_animations_to_end
 end
 
 When /^I follow the recurring todo link of "([^"]*)"$/ do |action_description|
diff --git a/features/view_done.feature b/features/view_done.feature
index cac54a20..bda393be 100644
--- a/features/view_done.feature
+++ b/features/view_done.feature
@@ -113,7 +113,7 @@ Feature: Show done
     Then I should be on the done recurring todos page
     And the page should be "2"
 
-  @selenium
+  @javascript @wip
   Scenario: I can toggle a done recurring todo active from done page
     Given I have a completed repeat pattern "test pattern"
     When I go to the done recurring todos page
@@ -123,7 +123,7 @@ Feature: Show done
     When I go to the recurring todos page
     Then I should see "test pattern" in the active recurring todos container
 
-  @selenium
+  @javascript
   Scenario: I can delete a recurring todo from the done page
     Given I have a completed repeat pattern "test pattern"
     When I go to the done recurring todos page
@@ -133,7 +133,7 @@ Feature: Show done
     When I go to the recurring todos page
     Then I should not see "test pattern" in the active recurring todos container
 
-  @selenium
+  @javascript
   Scenario Outline: I can toggle a todo active from the done pages
     When I go to the <page>
     Then I should see "todo 1"
@@ -153,7 +153,7 @@ Feature: Show done
     | all done actions page for project "test project"| "test project" project  |                                     |
     | all done actions page for tag "starred"         | home page               | in the context container for "@pc"  |
 
-  @selenium
+  @javascript
   Scenario Outline: I can toggle the star of a todo from the done pages
     When I go to the <page>
     Then I should see a starred "todo 1"
@@ -171,7 +171,7 @@ Feature: Show done
     | all done actions page for project "test project"|
     | all done actions page for tag "starred"         |
 
-  @selenium
+  @javascript
   Scenario: I can edit a project to active from the project done page
     Given I have a completed project called "completed project"
     When I go to the done projects page
@@ -181,7 +181,6 @@ Feature: Show done
     When I go to the projects page
     Then I should see "completed project"
 
-
   Scenario Outline: All pages are internationalized
     Given I set the locale to "<locale>"
     When I go to the <page>
@@ -221,12 +220,19 @@ Feature: Show done
     | all done actions page for context "@pc"         | es      |
     | all done actions page for project "test project"| es      |
     | all done actions page for tag "starred"         | es      |
-# fr locale needs changes from preference branch
-#    | done actions page                               | fr      |
-#    | all done actions page                           | fr      |
-#    | done actions page for context "@pc"             | fr      |
-#    | done actions page for project "test project"    | fr      |
-#    | done actions page for tag "starred"             | fr      |
-#    | all done actions page for context "@pc"         | fr      |
-#    | all done actions page for project "test project"| fr      |
-#    | all done actions page for tag "starred"         | fr      |
+    | done actions page                               | fr      |
+    | all done actions page                           | fr      |
+    | done actions page for context "@pc"             | fr      |
+    | done actions page for project "test project"    | fr      |
+    | done actions page for tag "starred"             | fr      |
+    | all done actions page for context "@pc"         | fr      |
+    | all done actions page for project "test project"| fr      |
+    | all done actions page for tag "starred"         | fr      |
+    | done actions page                               | cz      |
+    | all done actions page                           | cz      |
+    | done actions page for context "@pc"             | cz      |
+    | done actions page for project "test project"    | cz      |
+    | done actions page for tag "starred"             | cz      |
+    | all done actions page for context "@pc"         | cz      |
+    | all done actions page for project "test project"| cz      |
+    | all done actions page for tag "starred"         | cz      |