diff --git a/bmc/firmware-handler/firmware_handler.cpp b/bmc/firmware-handler/firmware_handler.cpp
index dc19b23..3d9b3fd 100644
--- a/bmc/firmware-handler/firmware_handler.cpp
+++ b/bmc/firmware-handler/firmware_handler.cpp
@@ -83,7 +83,7 @@
  * If there's an open firmware session, it'll already be present in the
  * list as "/flash/active/image", and if the hash has started,
  * "/flash/active/hash" regardless of mechanism.  This is done in the open
- * comamnd, no extra work is required here.
+ * command, no extra work is required here.
  */
 std::vector<std::string> FirmwareBlobHandler::getBlobIds()
 {
@@ -203,7 +203,7 @@
         return false;
     }
 
-    /* The size here refers to the size of the file -- of something analagous.
+    /* The size here refers to the size of the file -- of something analogous.
      */
     meta->size = (item->second->imageHandler)
                      ? item->second->imageHandler->getSize()
@@ -246,7 +246,7 @@
         }
     }
 
-    /* The blobState here relates to an active sesion, so we should return the
+    /* The blobState here relates to an active session, so we should return the
      * flags used to open this session.
      */
     meta->blobState = item->second->flags;
@@ -652,7 +652,7 @@
             /* They are closing a data pathway (image, tarball, hash). */
             changeState(UpdateState::verificationPending);
 
-            /* Add verify blob ID now that we can expect it, IIF they also wrote
+            /* Add verify blob ID now that we can expect it, IF they also wrote
              * some data.
              */
             if (std::count(blobIDs.begin(), blobIDs.end(), activeImageBlobId))
diff --git a/bmc/firmware-handler/lpc_aspeed.cpp b/bmc/firmware-handler/lpc_aspeed.cpp
index 364aff5..047f87b 100644
--- a/bmc/firmware-handler/lpc_aspeed.cpp
+++ b/bmc/firmware-handler/lpc_aspeed.cpp
@@ -158,7 +158,7 @@
         return false;
     }
 
-    /* TOOD: There is no close() method here, to close mappedFd, or mappedRegion
+    /* TODO: There is no close() method here, to close mappedFd, or mappedRegion
      * -- therefore, a good next step will be to evaluate whether or not the
      * other pieces should go here...
      */