diff --git a/Gemfile.lock b/Gemfile.lock
index 300a0459..94b32bb2 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -40,7 +40,7 @@ GIT
 
 GIT
   remote: git://github.com/travis-ci/travis-core.git
-  revision: 3154d3fbfa6fe4202ade27f5712927b72dc1673b
+  revision: 310d93a0c6dec233a15264172168fc58fb243f3b
   branch: sf-travis-api
   specs:
     travis-core (0.0.1)
diff --git a/lib/travis/api/app/responders/service.rb b/lib/travis/api/app/responders/service.rb
index 42792e6d..bd117e38 100644
--- a/lib/travis/api/app/responders/service.rb
+++ b/lib/travis/api/app/responders/service.rb
@@ -7,7 +7,7 @@ module Travis::Api::App::Responders
     def apply
       cache_control
       result = normalize(resource.run)
-      flash.concat(resource.messages) if result && resource.respond_to?(:messages)
+      result[:flash] = resource.messages if result && resource.respond_to?(:messages) # TODO should rather happen in the JSON responder, no?
       result
     end
 
diff --git a/spec/unit/endpoint/accounts_spec.rb b/spec/unit/endpoint/accounts_spec.rb
index ce98ab9b..2277ea8d 100644
--- a/spec/unit/endpoint/accounts_spec.rb
+++ b/spec/unit/endpoint/accounts_spec.rb
@@ -18,7 +18,7 @@ describe Travis::Api::App::Endpoint::Accounts do
       'login'       => user.login,
       'name'        => user.name,
       'type'        => 'user',
-      'reposCount'  => nil
+      'repos_count' => nil
     }]
   end
 end