diff --git a/.editorconfig b/.editorconfig
new file mode 100644
index 0000000..ddf69ea
--- /dev/null
+++ b/.editorconfig
@@ -0,0 +1,10 @@
+# SPDX-License-Identifier: GPL-3.0-or-later
+
+root = true
+
+[*.{c,h}]
+charset = utf-8
+end_of_line = lf
+insert_final_newline = true
+indent_style = tab
+indent_size = 8
diff --git a/hexagonrpcd/apps_std.c b/hexagonrpcd/apps_std.c
index 06519f8..ff4d5a7 100644
--- a/hexagonrpcd/apps_std.c
+++ b/hexagonrpcd/apps_std.c
@@ -197,9 +197,10 @@ static uint32_t apps_std_fopen_with_env(void *data,
 	}
 
 #ifdef HEXAGONRPC_VERBOSE
-	printf("openat($%s, %s) -> %d\n", (const char *) inbufs[1].p,
-					  (const char *) inbufs[3].p,
-					  fd);
+	printf("openat($%s, %s, %c) -> %d\n", (const char *) inbufs[1].p,
+					      (const char *) inbufs[3].p,
+					      rw_mode,
+					      fd);
 #endif
 
 	*out = fd;
diff --git a/hexagonrpcd/listener.c b/hexagonrpcd/listener.c
index 932c54d..e298688 100644
--- a/hexagonrpcd/listener.c
+++ b/hexagonrpcd/listener.c
@@ -254,7 +254,10 @@ static int invoke_requested_procedure(size_t n_ifaces,
 
 	if (REMOTE_SCALARS_INBUFS(sc) != in_count
 	 || REMOTE_SCALARS_OUTBUFS(sc) != out_count) {
-		fprintf(stderr, "Unexpected buffer count: %08x\n", sc);
+		fprintf(stderr, "Unexpected buffer count for method %u: %08x (in: %d vs %d, out: %d vs %d)\n",
+			method, sc,
+			REMOTE_SCALARS_INBUFS(sc), in_count,
+			REMOTE_SCALARS_OUTBUFS(sc), out_count);
 		*result = AEE_EBADPARM;
 		return 1;
 	}