diff --git a/CHANGELOG.md b/CHANGELOG.md
index a57f21e8..91fdc887 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -41,14 +41,14 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 ### Changed
 - Improve documentation.
 - Improve Unittest.
-- Send the response data in block of given lenght instead of sending all at once. [#35](https://github.com/greenbone/ospd/pull/35)
+- Send the response data in block of given length instead of sending all at once. [#35](https://github.com/greenbone/ospd/pull/35)
 - Makes the socket a non-blocking socket. [#78](https://github.com/greenbone/ospd/pull/78)
 - Refactor misc. [#111](https://github.com/greenbone/ospd/pull/111)
 - Refactor error module. [#95](https://github.com/greenbone/ospd/pull/95) [#112](https://github.com/greenbone/ospd/pull/112)
 - Refactor ospd connection handling. [#114](https://github.com/greenbone/ospd/pull/114)
 - Use ordered dictionary to maintain the results order. [#119](https://github.com/greenbone/ospd/pull/119)
 - Refactor ospd. [#120](https://github.com/greenbone/ospd/pull/120)
-- Set defualt unix socket path to /var/run/ospd/ospd.sock and default pid file path to /var/run/ospd.pid. [#140](https://github.com/greenbone/ospd/pull/140)
+- Set default unix socket path to /var/run/ospd/ospd.sock and default pid file path to /var/run/ospd.pid. [#140](https://github.com/greenbone/ospd/pull/140)
 
 ### Fixed
 - Fix scan progress. [#47](https://github.com/greenbone/ospd/pull/47)
diff --git a/ospd/server.py b/ospd/server.py
index 94eb6d99..8f5e3700 100644
--- a/ospd/server.py
+++ b/ospd/server.py
@@ -140,7 +140,7 @@ def close(self):
 
     @abstractmethod
     def handle_request(self, request, client_address):
-        """ Handle an incomming client request"""
+        """ Handle an incoming client request"""
 
     def _start_threading_server(self):
         server_thread = threading.Thread(target=self.server.serve_forever)