diff --git a/src/common/io/http/response.c b/src/common/io/http/response.c
index a2957c387..cc7d07ab9 100644
--- a/src/common/io/http/response.c
+++ b/src/common/io/http/response.c
@@ -164,8 +164,8 @@ httpResponseRead(THIS_VOID, Buffer *buffer, bool block)
                     // If no content remaining
                     if (this->contentRemaining == 0)
                     {
-                        // If chunked then consume the blank line that follows every chunk.  There might be more chunk data so loop back
-                        // around to check.
+                        // If chunked then consume the blank line that follows every chunk. There might be more chunk data so loop
+                        // back around to check.
                         if (this->contentChunked)
                         {
                             ioReadLine(rawRead);
diff --git a/src/common/io/socket/common.c b/src/common/io/socket/common.c
index a06c35d7b..f5c421b25 100644
--- a/src/common/io/socket/common.c
+++ b/src/common/io/socket/common.c
@@ -156,7 +156,7 @@ sckOptionSet(int fd)
         }
 #endif
 
-    // Set TCP_KEEPINTVL when available
+        // Set TCP_KEEPINTVL when available
 #ifdef TCP_KEEPIDLE
         if (socketLocal.tcpKeepAliveInterval > 0)
         {
diff --git a/src/common/io/tls/server.c b/src/common/io/tls/server.c
index 8ec64a6e1..ef7511092 100644
--- a/src/common/io/tls/server.c
+++ b/src/common/io/tls/server.c
@@ -315,11 +315,11 @@ tlsServerNew(
             // Let server set cipher order
             SSL_OP_CIPHER_SERVER_PREFERENCE |
 #ifdef SSL_OP_NO_RENEGOTIATION
-	        // Disable renegotiation, available since 1.1.0h. This affects only TLSv1.2 and older protocol versions as TLSv1.3 has
+            // Disable renegotiation, available since 1.1.0h. This affects only TLSv1.2 and older protocol versions as TLSv1.3 has
             // no support for renegotiation.
 	        SSL_OP_NO_RENEGOTIATION |
 #endif
-        	// Disable session tickets
+            // Disable session tickets
 	        SSL_OP_NO_TICKET);
 
         // Disable session caching
diff --git a/src/info/infoBackup.c b/src/info/infoBackup.c
index 884ce77e6..fd697b26a 100644
--- a/src/info/infoBackup.c
+++ b/src/info/infoBackup.c
@@ -202,7 +202,7 @@ infoBackupLoadCallback(void *data, const String *section, const String *key, con
             // Database id
             info.backupPgId = jsonReadUInt(jsonReadKeyRequireZ(json, INFO_KEY_DB_ID));
 
-                // Options
+            // Options
             info.optionArchiveCheck = jsonReadBool(jsonReadKeyRequireZ(json, INFO_BACKUP_KEY_OPT_ARCHIVE_CHECK));
             info.optionArchiveCopy = jsonReadBool(jsonReadKeyRequireZ(json, INFO_BACKUP_KEY_OPT_ARCHIVE_COPY));
             info.optionBackupStandby = jsonReadBool(jsonReadKeyRequireZ(json, INFO_BACKUP_KEY_OPT_BACKUP_STANDBY));
diff --git a/src/protocol/helper.c b/src/protocol/helper.c
old mode 100644
new mode 100755
index d062c2cfb..503cfa400
--- a/src/protocol/helper.c
+++ b/src/protocol/helper.c
@@ -559,8 +559,8 @@ protocolRemoteParam(ProtocolStorageType protocolStorageType, unsigned int hostId
                 }
             }
 
-            // Remove options that have been marked for removal if they are not already null or invalid. This is more efficient because
-            // cfgExecParam() won't have to search through as large a list looking for overrides.
+            // Remove options that have been marked for removal if they are not already null or invalid. This is more efficient
+            // because cfgExecParam() won't have to search through as large a list looking for overrides.
             if (remove)
             {
                 // Loop through option indexes
diff --git a/src/storage/posix/write.c b/src/storage/posix/write.c
old mode 100644
new mode 100755
index d8265593e..0b9221d6d
--- a/src/storage/posix/write.c
+++ b/src/storage/posix/write.c
@@ -86,7 +86,7 @@ storageWritePosixOpen(THIS_VOID)
     // Attempt to create the path if it is missing
     if (this->fd == -1 && errno == ENOENT && this->interface.createPath)                                            // {vm_covered}
     {
-         // Create the path
+        // Create the path
         storageInterfacePathCreateP(this->storage, this->path, false, false, this->interface.modePath);
 
         // Open file again
diff --git a/src/storage/s3/write.c b/src/storage/s3/write.c
index 67d2f0b0c..ecedb12b0 100644
--- a/src/storage/s3/write.c
+++ b/src/storage/s3/write.c
@@ -241,7 +241,7 @@ storageWriteS3Close(THIS_VOID)
                     .content = xmlDocumentBuf(partList));
                 HttpResponse *response = storageS3ResponseP(request);
 
-                // Error if there is no etag in the result. This indicates that the request did not succeed despite the success code.
+                // Error when no etag in the result. This indicates that the request did not succeed despite the success code.
                 if (xmlNodeChild(
                         xmlDocumentRoot(xmlDocumentNewBuf(httpResponseContent(response))), S3_XML_TAG_ETAG_STR, false) == NULL)
                 {
diff --git a/test/src/module/common/lockTest.c b/test/src/module/common/lockTest.c
old mode 100644
new mode 100755
index 5001e0cd6..8567f055e
--- a/test/src/module/common/lockTest.c
+++ b/test/src/module/common/lockTest.c
@@ -184,7 +184,7 @@ testRun(void)
             "lock is already held by this process");
         TEST_RESULT_VOID(lockRelease(true), "release archive lock");
 
-        // // -------------------------------------------------------------------------------------------------------------------------
+        // -------------------------------------------------------------------------------------------------------------------------
         lockLocal.execId = STRDEF("2-test");
 
         TEST_ASSIGN(lockFdTest, lockAcquireFile(backupLockFile, 0, true), "backup lock by file");