diff --git a/lib/travis/api/app/endpoint/artifacts.rb b/lib/travis/api/app/endpoint/artifacts.rb
index d5fbfc86..2a1d51b4 100644
--- a/lib/travis/api/app/endpoint/artifacts.rb
+++ b/lib/travis/api/app/endpoint/artifacts.rb
@@ -6,7 +6,7 @@ class Travis::Api::App
     class Artifacts < Endpoint
       # TODO: Add documentation.
       get('/:id') do |id|
-        service(:artifacts).find_one(params)
+        body service(:artifacts).find_one(params)
       end
     end
   end
diff --git a/lib/travis/api/app/endpoint/branches.rb b/lib/travis/api/app/endpoint/branches.rb
index ffe83a6f..29917ca7 100644
--- a/lib/travis/api/app/endpoint/branches.rb
+++ b/lib/travis/api/app/endpoint/branches.rb
@@ -6,7 +6,7 @@ class Travis::Api::App
     class Branches < Endpoint
       # TODO: Add documentation.
       get('/') do
-        body service(:branches).find_all(params)
+        body service(:branches).find_all(params), :type => :branches
       end
     end
   end
diff --git a/lib/travis/api/app/endpoint/builds.rb b/lib/travis/api/app/endpoint/builds.rb
index 14566d9f..cd74c36e 100644
--- a/lib/travis/api/app/endpoint/builds.rb
+++ b/lib/travis/api/app/endpoint/builds.rb
@@ -6,12 +6,12 @@ class Travis::Api::App
     class Builds < Endpoint
       # TODO: Add documentation.
       get '/' do
-        service(:builds).find_all(params)
+        body service(:builds).find_all(params)
       end
 
       # TODO: Add documentation.
       get '/:id' do
-        service(:builds).find_one(params)
+        body service(:builds).find_one(params)
       end
     end
   end
diff --git a/lib/travis/api/app/endpoint/hooks.rb b/lib/travis/api/app/endpoint/hooks.rb
index 1a4f2dcd..cf2ebfae 100644
--- a/lib/travis/api/app/endpoint/hooks.rb
+++ b/lib/travis/api/app/endpoint/hooks.rb
@@ -6,12 +6,12 @@ class Travis::Api::App
     class Hooks < Endpoint
       # TODO: Add implementation and documentation.
       get('/', scope: :private) do
-        service(:builds).find_all(params)
+        body service(:builds).find_all(params)
       end
 
       # TODO: Add implementation and documentation.
       put('/:id', scope: :admin) do
-        respond_with service(:hooks).update(params)
+        body service(:hooks).update(params)
       end
     end
   end
diff --git a/lib/travis/api/app/endpoint/jobs.rb b/lib/travis/api/app/endpoint/jobs.rb
index 8c2f21bb..66a70aff 100644
--- a/lib/travis/api/app/endpoint/jobs.rb
+++ b/lib/travis/api/app/endpoint/jobs.rb
@@ -6,12 +6,12 @@ class Travis::Api::App
     class Jobs < Endpoint
       # TODO: Add documentation.
       get('/') do
-        service(:jobs).find_all(params)
+        body service(:jobs).find_all(params)
       end
 
       # TODO: Add documentation.
       get('/:id') do
-        service(:jobs).find_one(params)
+        body service(:jobs).find_one(params)
       end
     end
   end
diff --git a/lib/travis/api/app/endpoint/workers.rb b/lib/travis/api/app/endpoint/workers.rb
index 90516ac0..47ff90c0 100644
--- a/lib/travis/api/app/endpoint/workers.rb
+++ b/lib/travis/api/app/endpoint/workers.rb
@@ -6,7 +6,7 @@ class Travis::Api::App
     class Workers < Endpoint
       # TODO: Add implementation and documentation.
       get('/') do
-        service(:workers).find_all(params)
+        body service(:workers).find_all(params)
       end
     end
   end