diff --git a/eclair-core/eclair-cli b/eclair-core/eclair-cli
index 8e7098e653..0a51aa6570 100755
--- a/eclair-core/eclair-cli
+++ b/eclair-core/eclair-cli
@@ -146,7 +146,7 @@ done;
 # jq filter parses response body for error message
 jq_filter='if type=="object" and .error != null then .error else .';
 
-# apply special jq filter if we are in "short" ouput mode -- only for specific commands such as 'channels'
+# apply special jq filter if we are in "short" output mode -- only for specific commands such as 'channels'
 if [ "$short" = true ]; then
   jq_channel_filter="{ nodeId, shortChannelId: .data.shortIds.real.realScid, channelId, state, commitments: (.data.commitments.active | map({balanceSat: (try (.localCommit.spec.toLocal / 1000 | floor) catch null), capacitySat: .fundingTx.amountSatoshis, fundingTxIndex: .fundingTxIndex, channelPoint: .fundingTx.outPoint})) }";
   case $api_endpoint in
diff --git a/eclair-core/src/main/scala/fr/acinq/eclair/crypto/TransportHandler.scala b/eclair-core/src/main/scala/fr/acinq/eclair/crypto/TransportHandler.scala
index 9eadfa62ad..a3c40f9201 100644
--- a/eclair-core/src/main/scala/fr/acinq/eclair/crypto/TransportHandler.scala
+++ b/eclair-core/src/main/scala/fr/acinq/eclair/crypto/TransportHandler.scala
@@ -189,10 +189,10 @@ class TransportHandler[T: ClassTag](keyPair: KeyPair, rs: Option[ByteVector], co
         stay() using d.copy(decryptor = dec1, unackedReceived = unackedReceived1)
 
       case Event(ReadAck(msg: T), d: NormalData[T@unchecked]) =>
-        // how many occurences of this message are still unacked?
+        // how many occurrences of this message are still unacked?
         val remaining = d.unackedReceived.getOrElse(msg, 0) - 1
         log.debug("acking message {}", msg)
-        // if all occurences have been acked then we remove the entry from the map
+        // if all occurrences have been acked then we remove the entry from the map
         val unackedReceived1 = if (remaining > 0) d.unackedReceived + (msg -> remaining) else d.unackedReceived - msg
         if (unackedReceived1.isEmpty) {
           log.debug("last incoming message was acked, resuming reading")
diff --git a/eclair-core/src/main/scala/fr/acinq/eclair/payment/send/PaymentLifecycle.scala b/eclair-core/src/main/scala/fr/acinq/eclair/payment/send/PaymentLifecycle.scala
index 809ee8b4ca..d126703927 100644
--- a/eclair-core/src/main/scala/fr/acinq/eclair/payment/send/PaymentLifecycle.scala
+++ b/eclair-core/src/main/scala/fr/acinq/eclair/payment/send/PaymentLifecycle.scala
@@ -123,7 +123,7 @@ class PaymentLifecycle(nodeParams: NodeParams, cfg: SendPaymentConfig, router: A
           // retry with another channel
           handleLocalFail(d, ChannelFailureException, isFatal = false)
         case HtlcResult.DisconnectedBeforeSigned(_) =>
-          // a disconnection occured before the outgoing htlc got signed
+          // a disconnection occurred before the outgoing htlc got signed
           // again, we consider it a local error and treat is as such
           handleLocalFail(d, DisconnectedException, isFatal = false)
       }
diff --git a/eclair-front/src/main/resources/application.conf b/eclair-front/src/main/resources/application.conf
index 5753049a17..df0eba49b3 100644
--- a/eclair-front/src/main/resources/application.conf
+++ b/eclair-front/src/main/resources/application.conf
@@ -2,7 +2,7 @@ eclair {
   enable-kamon = false
 
   front {
-    // To be overriden with the same key as the backend, so that the front has the same nodeid
+    // To be overridden with the same key as the backend, so that the front has the same nodeid
     priv-key-provider = "seed" // aws-sm (AWS Secrets Manager) or env (environment variable) or seed (seed.dat)
     priv-key = ${?NODE_PRIV_KEY} // used if priv-key-provider = env
     aws-sm.priv-key-name = "node-priv-key" // used if priv-key-provider = aws-sm