diff --git a/app/controllers/workflow_enhancements_controller.rb b/app/controllers/workflow_enhancements_controller.rb
index 78e71c2..becebed 100644
--- a/app/controllers/workflow_enhancements_controller.rb
+++ b/app/controllers/workflow_enhancements_controller.rb
@@ -1,5 +1,5 @@
 class WorkflowEnhancementsController < ApplicationController
-  before_filter :find_project_by_project_id #, :authorize
+  before_action :find_project_by_project_id #, :authorize
 
   def show
     @roles = User.current.roles_for_project(@project)
diff --git a/app/models/tracker_status.rb b/app/models/tracker_status.rb
index 9aa9661..19af06f 100644
--- a/app/models/tracker_status.rb
+++ b/app/models/tracker_status.rb
@@ -1,8 +1,6 @@
 class TrackerStatus < ActiveRecord::Base
   unloadable
 
-  attr_accessible :tracker_id, :issue_status_id
-
   belongs_to :tracker
   belongs_to :predef_issue_status, :class_name => 'IssueStatus', :foreign_key => 'issue_status_id'
 
diff --git a/lib/workflow_enhancements/graph.rb b/lib/workflow_enhancements/graph.rb
index 03439c0..823a924 100644
--- a/lib/workflow_enhancements/graph.rb
+++ b/lib/workflow_enhancements/graph.rb
@@ -80,7 +80,7 @@ def self.load_data(roles, trackers, issue=nil)
   private
 
   def self.is_default_status(tracker, status)
-    if Redmine::VERSION::MAJOR == 3
+    if Redmine::VERSION::MAJOR >= 3
       tracker.default_status == status
     else
       status.is_default
diff --git a/lib/workflow_enhancements/patches/action_view_rendering.rb b/lib/workflow_enhancements/patches/action_view_rendering.rb
index d093c33..5afb247 100644
--- a/lib/workflow_enhancements/patches/action_view_rendering.rb
+++ b/lib/workflow_enhancements/patches/action_view_rendering.rb
@@ -27,7 +27,7 @@ class Base
     #
     # This renders the "super" template, i.e. the one hidden by the plugin
     #
-    def render_with_workflow_enhancements(*args, &block)
+    def render(*args, &block)
       if args.first == :super
         last_view = view_stack.last || {:view => instance_variable_get(:@virtual_path).split('/').last}
         options = args[1] || {}
@@ -39,7 +39,7 @@ def render_with_workflow_enhancements(*args, &block)
         end
         options[:template] = last_view[:templates].shift
         view_stack << last_view
-        result = render_without_workflow_enhancements options
+        result = super options
         view_stack.pop
         result
       else
@@ -50,13 +50,13 @@ def render_with_workflow_enhancements(*args, &block)
           current_view[:locals] = options[:locals] if !current_view.nil? && options[:locals]
           view_stack << current_view if current_view.present?
         end
-        result = render_without_workflow_enhancements(*args, &block)
+        result = super
         view_stack.pop if current_view.present?
         result
       end
     end
 
-    alias_method_chain :render, :workflow_enhancements
+    #alias_method_chain :render, :workflow_enhancements
 
     def view_stack
       @_view_stack ||= []
diff --git a/lib/workflow_enhancements/patches/tracker_patch.rb b/lib/workflow_enhancements/patches/tracker_patch.rb
index a782bb6..1ef4a45 100644
--- a/lib/workflow_enhancements/patches/tracker_patch.rb
+++ b/lib/workflow_enhancements/patches/tracker_patch.rb
@@ -4,7 +4,7 @@ class Tracker
   has_many :tracker_statuses
   has_many :predef_issue_statuses, :through => :tracker_statuses
 
-  def issue_statuses_with_workflow_enhancements
+  def issue_statuses
     if @issue_statuses
       return @issue_statuses
     elsif new_record?
@@ -24,6 +24,5 @@ def issue_statuses_with_workflow_enhancements
     @issue_statuses = IssueStatus.where(:id => ids).all.sort
   end
 
-  alias_method_chain :issue_statuses, :workflow_enhancements
 end