diff --git a/src/libstore/derivations.cc b/src/libstore/derivations.cc
index 13f2b4770..4c51bdef3 100644
--- a/src/libstore/derivations.cc
+++ b/src/libstore/derivations.cc
@@ -364,12 +364,12 @@ static DrvHashModulo & pathDerivationModulo(Store & store, const StorePath & drv
 
 /* See the header for interface details. These are the implementation details.
 
-   For fixed ouput derivations, each hash in the map is not the
+   For fixed-output derivations, each hash in the map is not the
    corresponding output's content hash, but a hash of that hash along
    with other constant data. The key point is that the value is a pure
    function of the output's contents, and there are no preimage attacks
-   spoofing an either an output's contents for a derivation, or
-   derivation for an output's contents.
+   either spoofing an output's contents for a derivation, or
+   spoofing a derivation for an output's contents.
 
    For regular derivations, it looks up each subderivation from its hash
    and recurs. If the subderivation is also regular, it simply
diff --git a/src/libstore/derivations.hh b/src/libstore/derivations.hh
index c021bf907..9f8b7a23e 100644
--- a/src/libstore/derivations.hh
+++ b/src/libstore/derivations.hh
@@ -100,14 +100,14 @@ typedef std::variant<
    specified content hash and hash algorithm. (Currently they must have
    exactly one output (`out'), which is specified using the `outputHash'
    and `outputHashAlgo' attributes, but the algorithm doesn't assume
-   this). We don't want changes to such derivations to propagate upwards
+   this.) We don't want changes to such derivations to propagate upwards
    through the dependency graph, changing output paths everywhere.
 
    For instance, if we change the url in a call to the `fetchurl'
-   function, we do not want to rebuild everything depending on it (after
-   all, (the hash of) the file being downloaded is unchanged).  So the
- *output paths* should not change. On the other hand, the *derivation
- paths* should change to reflect the new dependency graph.
+   function, we do not want to rebuild everything depending on it---after
+   all, (the hash of) the file being downloaded is unchanged.  So the
+   *output paths* should not change. On the other hand, the *derivation
+   paths* should change to reflect the new dependency graph.
 
    For fixed output derivations, this returns a map from the names of
    each output to hashes unique up to the outputs' contents.