diff --git a/app/views/issues/show.html.erb b/app/views/issues/show.html.erb
index a84836b..2857e65 100644
--- a/app/views/issues/show.html.erb
+++ b/app/views/issues/show.html.erb
@@ -189,7 +189,7 @@ end %>
 <%= render partial: 'action_menu_edit' unless User.current.wants_comments_in_reverse_order? %>
 
 <% other_formats_links do |f| %>
-  <%= f.link_to 'Atom', :url => {:key => User.current.rss_key} %>
+  <%= f.link_to 'Atom', :url => {:key => User.current.atom_key} %>
   <%= f.link_to 'PDF' %>
 <% end %>
 
@@ -207,7 +207,7 @@ end %>
 <% end %>
 
 <% content_for :header_tags do %>
-    <%= auto_discovery_link_tag(:atom, {:format => 'atom', :key => User.current.rss_key}, :title => "#{@issue.project} - #{@issue.tracker} ##{@issue.id}: #{@issue.subject}") %>
+    <%= auto_discovery_link_tag(:atom, {:format => 'atom', :key => User.current.atom_key}, :title => "#{@issue.project} - #{@issue.tracker} ##{@issue.id}: #{@issue.subject}") %>
 <% end %>
 
 <%= context_menu %>
diff --git a/lib/redmine_workflow_hidden_fields/workflow_permission_patch.rb b/lib/redmine_workflow_hidden_fields/workflow_permission_patch.rb
index b6cdf12..654482d 100644
--- a/lib/redmine_workflow_hidden_fields/workflow_permission_patch.rb
+++ b/lib/redmine_workflow_hidden_fields/workflow_permission_patch.rb
@@ -5,7 +5,7 @@ def self.included(base)
         # The filters are part of validators are raw, they can be skipped with the following way.
         rule_inclusion_validation = base._validators[:rule].find{ |validator| validator.is_a? ActiveModel::Validations::InclusionValidator }
         base._validators[:rule].delete(rule_inclusion_validation)
-        filter = base._validate_callbacks.find{ |c| c.raw_filter == rule_inclusion_validation }.filter
+        filter = base._validate_callbacks.find{ |c| c.filter == rule_inclusion_validation }.filter
         skip_callback :validate, filter            
 
         validates_inclusion_of :rule, :in => %w(readonly required hidden)