diff --git a/app/helpers/welcome_helper.rb b/app/helpers/welcome_helper.rb
index ff2801a53..cce439d79 100644
--- a/app/helpers/welcome_helper.rb
+++ b/app/helpers/welcome_helper.rb
@@ -135,7 +135,7 @@ module WelcomeHelper
     # }
     # user_objs = User.find_by_sql("SELECT * FROM users WHERE (users.id IN #{"(" << users.join(',') << ")"} )")
     activity = Redmine::Activity::Fetcher.new(nil)
-    activity.scope_select{|t| ['changesets'].include?(t) ? nil : 'You may think you know what the following code does, may be. but why don"t you close this file and go play with something else, Now?' }
+    activity.scope_select{|t| ['changesets', 'documents'].include?(t) ? nil : 'You may think you know what the following code does, may be. but why don"t you close this file and go play with something else, Now?' }
     activity.events_welcome(nil, nil, {:limit => limit, :types => 'welcome'})
   end
 
diff --git a/app/views/layouts/base_projects.html.erb b/app/views/layouts/base_projects.html.erb
index 6e184fa25..682791923 100644
--- a/app/views/layouts/base_projects.html.erb
+++ b/app/views/layouts/base_projects.html.erb
@@ -76,7 +76,7 @@
 											<% end %>
 
 											<td class="font_index"><%=link_to "#{@project.members.count}", project_member_path(@project) %></td>
-											<td class="font_index"><%=link_to @project.watcher_users.count, :controller=>"projects", :action=>"watcherlist" %></td>
+											<td class="font_index"><%=link_to @project.watcher_users.count, :controller=>"projects", :action=>"watcherlist", :id => @project %></td>
 											<td class="font_index"><%=link_to "#{@project.issues.count}", project_issues_path(@project) %></td>
 											<!-- <td class="font_index"><%=link_to files_count, project_files_path(@project) %></td> -->
 										</tr>
diff --git a/app/views/projects/show.html.erb b/app/views/projects/show.html.erb
index 3436d62be..096db3218 100644
--- a/app/views/projects/show.html.erb
+++ b/app/views/projects/show.html.erb
@@ -21,7 +21,7 @@
 										<%= link_to_user(e.event_author) if e.respond_to?(:event_author) %>
 										<%= l(:label_new_activity) %> </span>
 										
-										<%= link_to "#{eventToLanguageCourse(e.event_type, @project)}: "<< format_activity_title(e.event_title), e.event_type.eql?("attachment") ? project_files_path(e.container) : e.event_url %>
+										<%= link_to "#{eventToLanguageCourse(e.event_type, @project)}: "<< format_activity_title(e.event_title), (e.event_type.eql?("attachment")&&e.container.kind_of?(Project)) ? project_files_path(e.container) : e.event_url %>
 									</td>
 								</tr>
 								<tr>