diff --git a/src/WSDoor.cpp b/src/WSDoor.cpp
index 01b395b3fe..ce51bb5125 100644
--- a/src/WSDoor.cpp
+++ b/src/WSDoor.cpp
@@ -43,8 +43,8 @@ class WSServerHandler;
 class WSConnection : public InfoSub
 {
 public:
-    typedef typename websocketpp::WSDOOR_SERVER::handler::connection_ptr connection_ptr;
-    typedef typename websocketpp::WSDOOR_SERVER::handler::message_ptr message_ptr;
+    typedef websocketpp::WSDOOR_SERVER::handler::connection_ptr connection_ptr;
+    typedef websocketpp::WSDOOR_SERVER::handler::message_ptr message_ptr;
 
 protected:
 	WSServerHandler<websocketpp::WSDOOR_SERVER>*	mHandler;
@@ -64,13 +64,13 @@ public:
 		nothing();
 	}
 
-	// Implement overriden functions from base class:
+	// Implement overridden functions from base class:
 	void send(const Json::Value& jvObj);
 };
 
 
 // A single instance of this object is made.
-// This instance dispatches all events.  There is no per connection persistency.
+// This instance dispatches all events.  There is no per connection persistence.
 template <typename endpoint_type>
 class WSServerHandler : public endpoint_type::handler
 {