diff --git a/app/models/c2/informant/form_element.rb b/app/models/c2/informant/form_element.rb
index a0f0404..089efc6 100644
--- a/app/models/c2/informant/form_element.rb
+++ b/app/models/c2/informant/form_element.rb
@@ -10,7 +10,7 @@ class C2::Informant::FormElement
   
   embedded_in :locus, :class_name => 'C2::Informant::Locus'
   
-  scope :enabled, :where => { :enabled => true }
+  scope :enabled, where(:enabled => true)
   
   delegate :klass, :to => :'_parent'
   
diff --git a/lib/c2/tasks.rake b/lib/c2/tasks.rake
index 58e72fa..91d18d9 100644
--- a/lib/c2/tasks.rake
+++ b/lib/c2/tasks.rake
@@ -18,7 +18,7 @@ namespace :c2 do
   
   def valid_scopes_for(document)
     valid_scopes = document.scopes.select do |method, scope|
-      valid = case conditions = scope.conditions
+      valid = case conditions = scope
       when Hash
         true
       when Proc