diff --git a/app/helpers/users_helper.rb b/app/helpers/users_helper.rb
index d5c0a89..cf567d2 100644
--- a/app/helpers/users_helper.rb
+++ b/app/helpers/users_helper.rb
@@ -18,7 +18,7 @@ module UsersHelper
     )
   end
 
-  def filter_title(filter)
+  def users_filter_title(filter)
     FILTER_TRANSLATION[filter]
   end
 
diff --git a/app/models/change_password.rb b/app/models/change_password.rb
index c59f722..6209372 100644
--- a/app/models/change_password.rb
+++ b/app/models/change_password.rb
@@ -2,7 +2,7 @@ class ChangePassword < Task
 
   attr_accessor :password, :password_confirmation
 
-  def self.human_attribute_name(attrib)
+  def self.human_attribute_name(attrib, options = {})
     case attrib.to_sym
     when :password
       _('Password')
diff --git a/app/models/feed_reader_block.rb b/app/models/feed_reader_block.rb
index ee96a0e..c02bc84 100644
--- a/app/models/feed_reader_block.rb
+++ b/app/models/feed_reader_block.rb
@@ -2,7 +2,7 @@ class FeedReaderBlock < Block
 
   attr_accessible :address, :update_errors
 
-  def initialize(attributes = nil)
+  def initialize(attributes = nil, options = {})
     data = attributes || {}
     super(data)
     self.enabled= !data[:address].blank?
diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
index a9eb739..6fe955a 100644
--- a/app/views/layouts/application.html.erb
+++ b/app/views/layouts/application.html.erb
@@ -10,10 +10,10 @@
 
     <%= noosfero_javascript %>
     <%= theme_javascript %>
+    <%= noosfero_stylesheets %>
 
     <%=
       # Load the principal css files:
-      stylesheet_link_tag(noosfero_stylesheets, :cache => 'cache') +
       stylesheet_import( %w( common help menu article button search blocks forms login-box ),
                          :themed_source => true ) + "\n" +
       import_blocks_stylesheets(:themed_source => true) + "\n" +
diff --git a/app/views/users/_users_list.html.erb b/app/views/users/_users_list.html.erb
index dce24e4..e6a4d4c 100644
--- a/app/views/users/_users_list.html.erb
+++ b/app/views/users/_users_list.html.erb
@@ -1,5 +1,5 @@
 <div class="environment-users-results-header">
-  <div id='environment-users-filter-title'><%= filter_title(@filter) %></div>
+  <div id='environment-users-filter-title'><%= users_filter_title(@filter) %></div>
   <%= filter_selector(@filter) %>
   <div style="clear: both"></div>
 </div>
--
libgit2 0.21.2