diff --git a/README.md b/README.md
index 93684b8..fa997e0 100644
--- a/README.md
+++ b/README.md
@@ -8,7 +8,7 @@ Build up your application through simple interfaces and re-use your application
 ##WebSocket Compliance
 
 * Supports the RFC6455, HyBi-10+, and Hixie76 protocol versions (at the same time)
-* Tested on Chrome 13 - 23, Firefox 6 - 16, Safari 5.0.1 - 6, iOS 4.2, iOS 5 - 6
+* Tested on Chrome 13 - 23, Firefox 6 - 17, Safari 5.0.1 - 6, iOS 4.2 - 6
 * Ratchet [passes](http://socketo.me/reports/ab/) the [Autobahn Testsuite](http://autobahn.ws/testsuite) (non-binary messages)
 
 ##Requirements
diff --git a/src/Ratchet/MessageInterface.php b/src/Ratchet/MessageInterface.php
index 4a527f8..7dd2cbd 100644
--- a/src/Ratchet/MessageInterface.php
+++ b/src/Ratchet/MessageInterface.php
@@ -4,9 +4,9 @@ namespace Ratchet;
 interface MessageInterface {
     /**
      * Triggered when a client sends data through the socket
-     * @param Ratchet\ConnectionInterface The socket/connection that sent the message to your application
+     * @param \Ratchet\ConnectionInterface The socket/connection that sent the message to your application
      * @param string The message received
-     * @throws Exception
+     * @throws \Exception
      */
     function onMessage(ConnectionInterface $from, $msg);
 }
\ No newline at end of file
diff --git a/src/Ratchet/Server/IoServer.php b/src/Ratchet/Server/IoServer.php
index 8b5a2ce..3e44b3f 100644
--- a/src/Ratchet/Server/IoServer.php
+++ b/src/Ratchet/Server/IoServer.php
@@ -1,7 +1,6 @@
 <?php
 namespace Ratchet\Server;
 use Ratchet\MessageComponentInterface;
-use Ratchet\ConnectionInterface;
 use React\EventLoop\LoopInterface;
 use React\Socket\ServerInterface;
 use React\EventLoop\Factory as LoopFactory;
diff --git a/src/Ratchet/WebSocket/HttpRequestParser.php b/src/Ratchet/WebSocket/HttpRequestParser.php
index 10960b1..e031928 100644
--- a/src/Ratchet/WebSocket/HttpRequestParser.php
+++ b/src/Ratchet/WebSocket/HttpRequestParser.php
@@ -3,8 +3,6 @@ namespace Ratchet\WebSocket;
 use Ratchet\MessageInterface;
 use Ratchet\ConnectionInterface;
 use Ratchet\WebSocket\Guzzle\Http\Message\RequestFactory;
-use Ratchet\WebSocket\Version\VersionInterface;
-use Guzzle\Http\Message\RequestInterface;
 
 /**
  * This class receives streaming data from a client request
diff --git a/tests/Ratchet/Tests/Mock/Component.php b/tests/Ratchet/Tests/Mock/Component.php
index 568d766..26427b4 100644
--- a/tests/Ratchet/Tests/Mock/Component.php
+++ b/tests/Ratchet/Tests/Mock/Component.php
@@ -2,7 +2,6 @@
 namespace Ratchet\Tests\Mock;
 use Ratchet\MessageComponentInterface;
 use Ratchet\WebSocket\WsServerInterface;
-use Ratchet\Tests\Mock\Socket as MockSocket;
 use Ratchet\ConnectionInterface;
 
 class Component implements MessageComponentInterface, WsServerInterface {
diff --git a/tests/Ratchet/Tests/Mock/WampComponent.php b/tests/Ratchet/Tests/Mock/WampComponent.php
index 2baf2a9..7493d6f 100644
--- a/tests/Ratchet/Tests/Mock/WampComponent.php
+++ b/tests/Ratchet/Tests/Mock/WampComponent.php
@@ -25,7 +25,7 @@ class WampComponent implements WampServerInterface, WsServerInterface {
         $this->last[__FUNCTION__] = func_get_args();
     }
 
-    public function onPublish(ConnectionInterface $conn, $topic, $event, array $exclude = array(), array $eligible = array()) {
+    public function onPublish(ConnectionInterface $conn, $topic, $event, array $exclude, array $eligible) {
         $this->last[__FUNCTION__] = func_get_args();
     }