diff --git a/citus-tools b/citus-tools
new file mode 160000
index 000000000..3376bd684
--- /dev/null
+++ b/citus-tools
@@ -0,0 +1 @@
+Subproject commit 3376bd6845f0614908ed304f5033bd644c82d3bf
diff --git a/src/include/distributed/commands.h b/src/include/distributed/commands.h
index ec2cb8a57..32bb38100 100644
--- a/src/include/distributed/commands.h
+++ b/src/include/distributed/commands.h
@@ -80,11 +80,11 @@ typedef enum DistOpsOperationType
  */
 typedef struct DistributeObjectOps
 {
-	char * (*deparse)(Node *);
+	char *(*deparse)(Node *);
 	void (*qualify)(Node *);
-	List * (*preprocess)(Node *, const char *, ProcessUtilityContext);
-	List * (*postprocess)(Node *, const char *);
-	List * (*address)(Node *, bool, bool);
+	List *(*preprocess)(Node *, const char *, ProcessUtilityContext);
+	List *(*postprocess)(Node *, const char *);
+	List *(*address)(Node *, bool, bool);
 	bool markDistributed;
 
 	/* fields used by common implementations, omitted for specialized implementations */
diff --git a/src/include/distributed/listutils.h b/src/include/distributed/listutils.h
index db9ea7ce7..32f9102c4 100644
--- a/src/include/distributed/listutils.h
+++ b/src/include/distributed/listutils.h
@@ -160,7 +160,7 @@ typedef struct ListCellAndListWrapper
 	for (int var ## PositionDoNotUse = 0; \
 		 (var ## PositionDoNotUse) < list_length(l) && \
 		 (((var) = list_nth(l, var ## PositionDoNotUse)) || true); \
-		 var ## PositionDoNotUse ++)
+		 var ## PositionDoNotUse++)
 
 /* utility functions declaration shared within this module */
 extern List * SortList(List *pointerList,