diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb
index 459beec9..c832250a 100644
--- a/app/controllers/projects_controller.rb
+++ b/app/controllers/projects_controller.rb
@@ -13,7 +13,7 @@ class ProjectsController < ApplicationController
   def index
     @projects = current_user.projects
     @projects = @projects.select(&:last_activity_date).sort_by(&:last_activity_date).reverse
-    @events = Event.where(:project_id => @projects.map(&:id)).recent.limit(40)
+    @events = Event.where(:project_id => @projects.map(&:id)).recent.limit(20)
   end
 
   def new
diff --git a/app/models/gitlab_serialize.rb b/app/models/gitlab_serialize.rb
index d5fda2a7..efd63cce 100644
--- a/app/models/gitlab_serialize.rb
+++ b/app/models/gitlab_serialize.rb
@@ -1,6 +1,12 @@
 class GitlabSerialize
   # Called to deserialize data to ruby object.
   def load(data)
+    hash = parse_data(data)
+    hash = HashWithIndifferentAccess.new(hash) if hash
+    hash
+  end
+
+  def parse_data(data)
     JSON.load(data)
   rescue JSON::ParserError
     begin