diff --git a/app/models/query.rb b/app/models/query.rb
index f869f648..4cc5a63a 100644
--- a/app/models/query.rb
+++ b/app/models/query.rb
@@ -164,8 +164,6 @@ class Query < ActiveRecord::Base
       end
       @project.all_custom_fields.select(&:is_filter?).each do |field|
         case field.field_format
-        when "string", "int"
-          options = { :type => :string, :order => 20 }
         when "text"
           options = { :type => :text, :order => 20 }
         when "list"
@@ -174,6 +172,8 @@ class Query < ActiveRecord::Base
           options = { :type => :date, :order => 20 }
         when "bool"
           options = { :type => :list, :values => [[l(:general_text_yes), "1"], [l(:general_text_no), "0"]], :order => 20 }
+        else
+          options = { :type => :string, :order => 20 }
         end          
         @available_filters["cf_#{field.id}"] = options.merge({ :name => field.name })
       end
diff --git a/app/views/welcome/index.rhtml b/app/views/welcome/index.rhtml
index af09eea9..d1e871c4 100644
--- a/app/views/welcome/index.rhtml
+++ b/app/views/welcome/index.rhtml
@@ -26,6 +26,5 @@
 </div>	
 
 <% content_for :header_tags do %>
-<%= auto_discovery_link_tag(:rss,  {:controller => 'feeds', :action => 'news', :key => @key}, {:title => l(:label_news_latest)}) %>
-<%= auto_discovery_link_tag(:atom, {:controller => 'feeds', :action => 'news', :key => @key, :format => 'atom'}, {:title => l(:label_news_latest)}) %>
+<%= auto_discovery_link_tag(:atom, {:controller => 'news', :action => 'index', :key => User.current.rss_key, :format => 'atom'}, {:title => l(:label_news_latest)}) %>
 <% end %>
diff --git a/lib/redmine/scm/adapters/mercurial_adapter.rb b/lib/redmine/scm/adapters/mercurial_adapter.rb
index 54fa8c4f..a631916c 100644
--- a/lib/redmine/scm/adapters/mercurial_adapter.rb
+++ b/lib/redmine/scm/adapters/mercurial_adapter.rb
@@ -91,7 +91,7 @@ module Redmine
                                              :author => changeset[:user],
                                              :time => Time.parse(changeset[:date]),
                                              :message => changeset[:description],
-                                             :paths => changeset[:files].split.collect{|path| {:action => 'X', :path => "/#{path}"}}
+                                             :paths => changeset[:files].to_s.split.collect{|path| {:action => 'X', :path => "/#{path}"}}
                   })
                   changeset = {}
                 end