diff --git a/src/mkv/write.c b/src/mkv/write.c
index fdbab5512ab0d1bb6ac0ad0670400b6f087bf8b6..ad9de592e29ef96b8726a5976832d93d8f7986f4 100644
--- a/src/mkv/write.c
+++ b/src/mkv/write.c
@@ -170,13 +170,15 @@ metadata_from_path(char *const mkvfile, struct kara_metadata *meta)
     reti = regexec(&regex, mkvfile, nmatch, pmatch, 0);
     if (!reti) {
         /* Match */
-        memcpy(meta->category, mkvfile + pmatch[2].rm_so, pmatch[2].rm_eo - pmatch[2].rm_so);
-        memcpy(meta->language, mkvfile + pmatch[3].rm_so, pmatch[3].rm_eo - pmatch[3].rm_so);
+        // *INDENT-OFF*
+        memcpy(meta->category,    mkvfile + pmatch[2].rm_so, pmatch[2].rm_eo - pmatch[2].rm_so);
+        memcpy(meta->language,    mkvfile + pmatch[3].rm_so, pmatch[3].rm_eo - pmatch[3].rm_so);
         memcpy(meta->author_name, mkvfile + pmatch[4].rm_so, pmatch[4].rm_eo - pmatch[4].rm_so);
         memcpy(meta->source_name, mkvfile + pmatch[5].rm_so, pmatch[5].rm_eo - pmatch[5].rm_so);
-        memcpy(meta->song_type, mkvfile + pmatch[6].rm_so, pmatch[6].rm_eo - pmatch[6].rm_so);
-        memcpy(msgbuf, mkvfile + pmatch[7].rm_so, pmatch[7].rm_eo - pmatch[7].rm_so);
-        memcpy(meta->song_name, mkvfile + pmatch[8].rm_so, pmatch[8].rm_eo - pmatch[8].rm_so);
+        memcpy(meta->song_type,   mkvfile + pmatch[6].rm_so, pmatch[6].rm_eo - pmatch[6].rm_so);
+        memcpy(msgbuf,            mkvfile + pmatch[7].rm_so, pmatch[7].rm_eo - pmatch[7].rm_so);
+        memcpy(meta->song_name,   mkvfile + pmatch[8].rm_so, pmatch[8].rm_eo - pmatch[8].rm_so);
+        // *INDENT-ON*
     } else if (REG_NOMATCH == reti) {
         LOG_ERROR("WRITER", "No match for: %s", mkvfile);
         goto error;
diff --git a/src/module/module_repo.c b/src/module/module_repo.c
index 63ab1adfcb1a8d49816e9b56fddb7b2138a8bd02..5866a92f7b50ffe2f36a13e206313f82b228289b 100644
--- a/src/module/module_repo.c
+++ b/src/module/module_repo.c
@@ -49,7 +49,9 @@ struct module_repo_internal {
     /* Worker threads */
     struct worker_pool workers;
     pthread_mutex_t mtx; /* Protect the updating field */
-    volatile int updating : REPO_UPDATE_TYPE_COUNT;
+    // *INDENT-OFF*
+    volatile unsigned int updating : REPO_UPDATE_TYPE_COUNT; /* The correct size */
+    // *INDENT-ON*
 
     /* The database and the queue */
     struct queue *queue;