diff --git a/src/plugins/common_json.c b/src/plugins/common_json.c
index 839d4ed11..68f5c8ec2 100644
--- a/src/plugins/common_json.c
+++ b/src/plugins/common_json.c
@@ -16,8 +16,8 @@
 
 #define _GNU_SOURCE
 
-#include "compat.h"
 #include "common_json.h"
+#include "compat.h"
 
 #include <assert.h>
 #include <errno.h>
@@ -314,7 +314,7 @@ srpjson_get_pwd(const char *plg_name, uid_t *uid, char **user)
                     *user, strerror(r));
         } else {
             srplg_log_errinfo(&err_info, plg_name, NULL, SR_ERR_INTERNAL, "Retrieving UID \"%lu\" passwd entry failed (%s).",
-                    (unsigned long int)*uid, strerror(r));
+                    (unsigned long)*uid, strerror(r));
         }
         goto cleanup;
     } else if (!pwd_p) {
@@ -323,7 +323,7 @@ srpjson_get_pwd(const char *plg_name, uid_t *uid, char **user)
                     "Retrieving user \"%s\" passwd entry failed (No such user).", *user);
         } else {
             srplg_log_errinfo(&err_info, plg_name, NULL, SR_ERR_NOT_FOUND,
-                    "Retrieving UID \"%lu\" passwd entry failed (No such UID).", (unsigned long int)*uid);
+                    "Retrieving UID \"%lu\" passwd entry failed (No such UID).", (unsigned long)*uid);
         }
         goto cleanup;
     }
@@ -390,7 +390,7 @@ srpjson_get_grp(const char *plg_name, gid_t *gid, char **group)
                     *group, strerror(r));
         } else {
             srplg_log_errinfo(&err_info, plg_name, NULL, SR_ERR_INTERNAL, "Retrieving GID \"%lu\" grp entry failed (%s).",
-                    (unsigned long int)*gid, strerror(r));
+                    (unsigned long)*gid, strerror(r));
         }
         goto cleanup;
     } else if (!grp_p) {
@@ -399,7 +399,7 @@ srpjson_get_grp(const char *plg_name, gid_t *gid, char **group)
                     "Retrieving group \"%s\" grp entry failed (No such group).", *group);
         } else {
             srplg_log_errinfo(&err_info, plg_name, NULL, SR_ERR_NOT_FOUND,
-                    "Retrieving GID \"%lu\" grp entry failed (No such GID).", (unsigned long int)*gid);
+                    "Retrieving GID \"%lu\" grp entry failed (No such GID).", (unsigned long)*gid);
         }
         goto cleanup;
     }
diff --git a/src/plugins/ds_json.c b/src/plugins/ds_json.c
index d2e08a113..15d48da94 100644
--- a/src/plugins/ds_json.c
+++ b/src/plugins/ds_json.c
@@ -364,7 +364,7 @@ srpds_json_store(const struct lys_module *mod, sr_datastore_t ds, const struct l
         /* must exist */
         break;
     case SR_DS_RUNNING:
-        /* must exist except for case when all the data were disabled by a feature, which has just been enabled */
+    /* must exist except for case when all the data were disabled by a feature, which has just been enabled */
     /* fallthrough */
     case SR_DS_CANDIDATE:
     case SR_DS_OPERATIONAL: