diff --git a/.codespellignore b/.codespellignore
index 3dc8d6b681..da7750fb70 100644
--- a/.codespellignore
+++ b/.codespellignore
@@ -182,3 +182,6 @@ function ok(a,b){for(var c=a.wa[b].data.items,d=c.length,g=N(a.wa[b].id),h="",i=
 import java.nio.ByteOrder;
         byte[] header = ByteBuffer.allocate(4).order(ByteOrder.nativeOrder()).putInt(headerContent).array();
         int headerValue = ByteBuffer.wrap(header).order(ByteOrder.nativeOrder()).getInt();
+  std::string ErrorString() const;
+std::string SchemaErrorLogger::ErrorString() const {
+  return m_error_logger.ErrorString();
diff --git a/common/rdm/StringMessageBuilder.cpp b/common/rdm/StringMessageBuilder.cpp
index 66b5c9fe61..70231ca8b9 100644
--- a/common/rdm/StringMessageBuilder.cpp
+++ b/common/rdm/StringMessageBuilder.cpp
@@ -313,7 +313,7 @@ void StringMessageBuilder::Visit(
 
 
 /**
- * This is a noop since we handle decending ourselves in Visit()
+ * This is a no-op since we handle descending ourselves in Visit()
  */
 void StringMessageBuilder::PostVisit(
     const ola::messaging::FieldDescriptorGroup *descriptor) {
diff --git a/include/ola/gen_callbacks.py b/include/ola/gen_callbacks.py
index 86e2e7dc4d..9061b9a8c7 100755
--- a/include/ola/gen_callbacks.py
+++ b/include/ola/gen_callbacks.py
@@ -464,7 +464,7 @@ def main():
   Header()
 
   # exec_time : [bind time args]
-  calback_types = {
+  callback_types = {
     0: [0, 1, 2, 3, 4],
     1: [0, 1, 2, 3, 4],
     2: [0, 1, 2, 3, 4],
@@ -472,9 +472,9 @@ def main():
     4: [0, 1, 2, 3, 4],
   }
 
-  for exec_time in sorted(calback_types):
+  for exec_time in sorted(callback_types):
     GenerateBase(exec_time)
-    for bind_time in calback_types[exec_time]:
+    for bind_time in callback_types[exec_time]:
       GenerateMethodCallback(bind_time, exec_time, is_method=False)
       GenerateMethodCallback(bind_time, exec_time)
   Footer()
diff --git a/include/ola/io/MemoryBuffer.h b/include/ola/io/MemoryBuffer.h
index 506ed2dc31..9a84a8c28d 100644
--- a/include/ola/io/MemoryBuffer.h
+++ b/include/ola/io/MemoryBuffer.h
@@ -14,7 +14,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  *
  * MemoryBuffer.h
- * An derrived class of InputBuffer that wraps a memory buffer.
+ * A derived class of InputBuffer that wraps a memory buffer.
  * Copyright (C) 2012 Simon Newton
  */
 
diff --git a/include/ola/rdm/MessageDeserializer.h b/include/ola/rdm/MessageDeserializer.h
index e0f92b258f..4d228125e2 100644
--- a/include/ola/rdm/MessageDeserializer.h
+++ b/include/ola/rdm/MessageDeserializer.h
@@ -52,7 +52,7 @@ class MessageDeserializer: public ola::messaging::FieldDescriptorVisitor {
         const uint8_t *data,
         unsigned int length);
 
-    // we handle decending into groups ourself
+    // we handle descending into groups ourself
     bool Descend() const { return false; }
 
     void Visit(const ola::messaging::BoolFieldDescriptor*);
diff --git a/include/ola/rdm/StringMessageBuilder.h b/include/ola/rdm/StringMessageBuilder.h
index 7eaeaa34b2..4f08afc85e 100644
--- a/include/ola/rdm/StringMessageBuilder.h
+++ b/include/ola/rdm/StringMessageBuilder.h
@@ -53,7 +53,7 @@ class StringMessageBuilder: public ola::messaging::FieldDescriptorVisitor {
     StringMessageBuilder();
     ~StringMessageBuilder();
 
-    // we handle decending into groups ourself
+    // we handle descending into groups ourself
     bool Descend() const { return false; }
     const ola::messaging::Message *GetMessage(
         const std::vector<std::string> &inputs,
diff --git a/include/ola/thread/ExecutorInterface.h b/include/ola/thread/ExecutorInterface.h
index 85a1100ad8..c98a6dc4ef 100644
--- a/include/ola/thread/ExecutorInterface.h
+++ b/include/ola/thread/ExecutorInterface.h
@@ -49,9 +49,9 @@ class ExecutorInterface {
    *  - For a given thread, callbacks will be run in the order in which they
    *    were added.
    *
-   * When queuing callbacks, you ether need to ensure that either:
+   * When queuing callbacks, you need to ensure that either:
    *   - The objects used in the callback outlive the ExecutorInterface
-   *   - That the calback is run before the objects are deleted.
+   *   - That the callback is run before the objects are deleted.
    *
    * To achieve the latter it's common to keep track of the number of
    * outstanding callbacks and then call DrainCallbacks() in the destructor
diff --git a/include/olad/Plugin.h b/include/olad/Plugin.h
index 0ae96d5fb9..623718a2ca 100644
--- a/include/olad/Plugin.h
+++ b/include/olad/Plugin.h
@@ -69,7 +69,7 @@ class AbstractPlugin {
   /**
    * @brief Start the plugin
    *
-   * Calls start_hook() which can be over-ridden by the derrived classes.
+   * Calls StartHook() which can be overridden by the derived classes.
    * @return true if we started ok, false otherwise
    */
   virtual bool Start() = 0;
@@ -77,7 +77,7 @@ class AbstractPlugin {
   /**
    * @brief Stop the plugin
    *
-   * Calls stop_hook() which can be over-ridden by the derrived classes.
+   * Calls StopHook() which can be overridden by the derived classes.
    * @return true on success, false on failure
    */
   virtual bool Stop() = 0;
diff --git a/include/olad/Universe.h b/include/olad/Universe.h
index a381887340..27edba6ee3 100644
--- a/include/olad/Universe.h
+++ b/include/olad/Universe.h
@@ -93,7 +93,7 @@ class Universe: public ola::rdm::RDMControllerInterface {
     bool SetDMX(const DmxBuffer &buffer);
     const DmxBuffer &GetDMX() const { return m_buffer; }
 
-    // These are the ports we need to nofity when data changes
+    // These are the ports we need to notify when data changes
     bool AddPort(InputPort *port);
     bool AddPort(OutputPort *port);
     bool RemovePort(InputPort *port);
diff --git a/olad/plugin_api/UniverseStore.cpp b/olad/plugin_api/UniverseStore.cpp
index 4c0d313c64..4ac1fc58db 100644
--- a/olad/plugin_api/UniverseStore.cpp
+++ b/olad/plugin_api/UniverseStore.cpp
@@ -104,27 +104,27 @@ void UniverseStore::DeleteAll() {
     SaveUniverseSettings(iter->second);
     delete iter->second;
   }
-  m_deletion_candiates.clear();
+  m_deletion_candidates.clear();
   m_universe_map.clear();
 }
 
 void UniverseStore::AddUniverseGarbageCollection(Universe *universe) {
-  m_deletion_candiates.insert(universe);
+  m_deletion_candidates.insert(universe);
 }
 
 void UniverseStore::GarbageCollectUniverses() {
   set<Universe*>::iterator iter;
   UniverseMap::iterator map_iter;
 
-  for (iter = m_deletion_candiates.begin();
-       iter != m_deletion_candiates.end(); iter++) {
+  for (iter = m_deletion_candidates.begin();
+       iter != m_deletion_candidates.end(); iter++) {
     if (!(*iter)->IsActive()) {
       SaveUniverseSettings(*iter);
       m_universe_map.erase((*iter)->UniverseId());
       delete *iter;
     }
   }
-  m_deletion_candiates.clear();
+  m_deletion_candidates.clear();
 }
 
 
diff --git a/olad/plugin_api/UniverseStore.h b/olad/plugin_api/UniverseStore.h
index c92d37ee79..553dcdfe84 100644
--- a/olad/plugin_api/UniverseStore.h
+++ b/olad/plugin_api/UniverseStore.h
@@ -98,8 +98,8 @@ class UniverseStore {
   Preferences *m_preferences;
   ExportMap *m_export_map;
   UniverseMap m_universe_map;
-  std::set<Universe*> m_deletion_candiates;  // list of universes we may be
-                                             // able to delete
+  std::set<Universe*> m_deletion_candidates;  // list of universes we may be
+                                              // able to delete
   Clock m_clock;
 
   bool RestoreUniverseSettings(Universe *universe) const;