diff --git a/src/Guzzle/Http/Curl/CurlHandle.php b/src/Guzzle/Http/Curl/CurlHandle.php
index 24b71960..d8e5f395 100644
--- a/src/Guzzle/Http/Curl/CurlHandle.php
+++ b/src/Guzzle/Http/Curl/CurlHandle.php
@@ -68,7 +68,11 @@ class CurlHandle
             CURLOPT_HTTPHEADER     => array(),
             CURLOPT_HEADERFUNCTION => array($mediator, 'receiveResponseHeader'),
             CURLOPT_HTTP_VERSION   => $request->getProtocolVersion() === '1.0'
-                ? CURL_HTTP_VERSION_1_0 : CURL_HTTP_VERSION_1_1
+                ? CURL_HTTP_VERSION_1_0 : CURL_HTTP_VERSION_1_1,
+            // Verifies the authenticity of the peer's certificate
+            CURLOPT_SSL_VERIFYPEER => 1,
+            // Certificate must indicate that the server is the server to which you meant to connect
+            CURLOPT_SSL_VERIFYHOST => 2
         );
 
         // Enable the progress function if the 'progress' param was set
diff --git a/src/Guzzle/Service/Builder/ServiceBuilder.php b/src/Guzzle/Service/Builder/ServiceBuilder.php
index 207046f5..4e37f196 100644
--- a/src/Guzzle/Service/Builder/ServiceBuilder.php
+++ b/src/Guzzle/Service/Builder/ServiceBuilder.php
@@ -91,13 +91,7 @@ class ServiceBuilder extends AbstractHasDispatcher implements ServiceBuilderInte
     }
 
     /**
-     * Get a client using a registered builder
-     *
-     * @param string $name      Name of the registered client to retrieve
-     * @param bool   $throwAway Set to TRUE to not store the client for later retrieval from the ServiceBuilder
-     *
-     * @return ClientInterface
-     * @throws ServiceNotFoundException when a client cannot be found by name
+     * {@inheritdoc}
      */
     public function get($name, $throwAway = false)
     {
@@ -132,12 +126,7 @@ class ServiceBuilder extends AbstractHasDispatcher implements ServiceBuilderInte
     }
 
     /**
-     * Register a client by name with the service builder
-     *
-     * @param string $key     Name of the client to register
-     * @param mixed  $service Service to register
-     *
-     * @return ServiceBuilderInterface
+     * {@inheritdoc}
      */
     public function set($key, $service)
     {
diff --git a/src/Guzzle/Service/Builder/ServiceBuilderInterface.php b/src/Guzzle/Service/Builder/ServiceBuilderInterface.php
index f6048b5f..795321a3 100644
--- a/src/Guzzle/Service/Builder/ServiceBuilderInterface.php
+++ b/src/Guzzle/Service/Builder/ServiceBuilderInterface.php
@@ -24,8 +24,8 @@ interface ServiceBuilderInterface
     /**
      * Register a client by name with the service builder
      *
-     * @param string $name  Name of the client to register
-     * @param mixed  $value Service to register
+     * @param string $key     Name of the client to register
+     * @param mixed  $service Service to register
      *
      * @return ServiceBuilderInterface
      */
diff --git a/tests/Guzzle/Tests/GuzzleTestCase.php b/tests/Guzzle/Tests/GuzzleTestCase.php
index 3d196dc3..7e19b487 100644
--- a/tests/Guzzle/Tests/GuzzleTestCase.php
+++ b/tests/Guzzle/Tests/GuzzleTestCase.php
@@ -10,6 +10,7 @@ use Guzzle\Http\Message\HeaderComparison;
 use Guzzle\Plugin\Mock\MockPlugin;
 use Guzzle\Service\Client;
 use Guzzle\Service\Builder\ServiceBuilderInterface;
+use Guzzle\Service\Builder\ServiceBuilder;
 use Guzzle\Tests\Mock\MockObserver;
 use Guzzle\Tests\Http\Server;
 use RuntimeException;
@@ -53,7 +54,7 @@ abstract class GuzzleTestCase extends \PHPUnit_Framework_TestCase
     /**
      * Set the service builder to use for tests
      *
-     * @param ServiceBuilder $builder Service builder
+     * @param ServiceBuilderInterface $builder Service builder
      */
     public static function setServiceBuilder(ServiceBuilderInterface $builder)
     {
@@ -102,7 +103,7 @@ abstract class GuzzleTestCase extends \PHPUnit_Framework_TestCase
     /**
      * Get a wildcard observer for an event dispatcher
      *
-     * @param HasEventDispatcherInterface $hasEvent
+     * @param HasDispatcherInterface $hasEvent
      *
      * @return MockObserver
      */
@@ -134,6 +135,8 @@ abstract class GuzzleTestCase extends \PHPUnit_Framework_TestCase
      * Mark a request as being mocked
      *
      * @param RequestInterface $request
+     *
+     * @return self
      */
     public function addMockedRequest(RequestInterface $request)
     {
@@ -207,7 +210,7 @@ abstract class GuzzleTestCase extends \PHPUnit_Framework_TestCase
      * @param array $filteredHeaders Array of special headers
      * @param array $actualHeaders Array of headers to check against
      *
-     * @return array|false Returns an array of the differences or FALSE if none
+     * @return array|bool Returns an array of the differences or FALSE if none
      */
     public function compareHeaders($filteredHeaders, $actualHeaders)
     {