Added fixes for Redmine 2.3