diff --git a/groundStation/src/cli/cli.h b/groundStation/src/cli/cli.h
index 455e5e6007f10d86178b8ff07c21071043f323ec..2951fd8d4c648038ab5fb94f7d261ad6e73ecfba 100644
--- a/groundStation/src/cli/cli.h
+++ b/groundStation/src/cli/cli.h
@@ -16,15 +16,15 @@ enum CommandNameIds{
 typedef int (*cli_function_ptr)(struct backend_conn *, int, char **);
 static cli_function_ptr cli_functions[2] = {
 	&cli_monitor,
-	// &cli_setpid,
 	&cli_getpid
+	// &cli_setpid,
 	// &cli_getimu
 };
 
 static char* commandNames[MAX_COMMANDS] = {
 	"monitor",
-	"setPid",
 	"getPid",
+	"setPid",
 	"getImu"
 };
 
diff --git a/groundStation/src/cli/cli_monitor.c b/groundStation/src/cli/cli_monitor.c
index 0d433c7baa3537b166cbac384106d3e06b49fbcf..7ce0d3314e65609c5d016d0922ef577917a4879e 100644
--- a/groundStation/src/cli/cli_monitor.c
+++ b/groundStation/src/cli/cli_monitor.c
@@ -8,6 +8,8 @@
 
 #include "cli_monitor.h"
 
+static void timespec_diff(struct timespec *start,  struct timespec *result);
+
 int cli_monitor(struct backend_conn * conn,	int argc, char **argv) {
 	int c, result;
 	int timeFlag = 0;
@@ -17,7 +19,6 @@ int cli_monitor(struct backend_conn * conn,	int argc, char **argv) {
 	static struct timespec lastChecked;
 	static int nsecs, rate = 10;
 
-
  	while ((c = getopt(argc, argv, "t:r:")) != -1) {
 		switch(c) {
 			case 't' :
@@ -63,10 +64,12 @@ int monitor(struct backend_conn * conn) {
 		return 1;
 	}
 
+	//TODO : HANDLE RETURN DATA
+
 	return 0;
 }
 
-void timespec_diff(struct timespec *start, struct timespec *result)
+static void timespec_diff(struct timespec *start, struct timespec *result)
 {
 	struct timespec stop;
 	clock_gettime(CLOCK_REALTIME, &stop);
diff --git a/groundStation/src/cli/cli_monitor.h b/groundStation/src/cli/cli_monitor.h
index fc3cbef43edccbca2911e7bcebe8a6ae464a2b77..308721bb89f177da345269971a8d63b32d9dc39c 100644
--- a/groundStation/src/cli/cli_monitor.h
+++ b/groundStation/src/cli/cli_monitor.h
@@ -11,7 +11,4 @@ int cli_monitor(struct backend_conn * conn,	int argc, char **argv);
 
 // Return 0 on success and 1 otherwise
 int monitor(struct backend_conn * conn);
-
-
-void timespec_diff(struct timespec *start,  struct timespec *result);
 #endif
\ No newline at end of file
diff --git a/groundStation/src/frontend/frontend_common.c b/groundStation/src/frontend/frontend_common.c
index 2492822acea6626bf7b4402f3246267444eff463..cbedbe42a6dcbed1622f2109d833a75a1ce6d7ba 100644
--- a/groundStation/src/frontend/frontend_common.c
+++ b/groundStation/src/frontend/frontend_common.c
@@ -56,8 +56,8 @@ struct backend_conn * ucart_backendConnect()
 		perror("fdopen");
 		goto fail_malloc_conn;
 	}
-	if (setbuf(conn->socket, NULL, _IONBF)) {
-		warn("setbuf");
+	if (setvbuf(conn->socket, NULL, _IONBF, 0)) {
+		warn("setvbuf");
 	}
 
 	/* success */