diff --git a/groundStation/Makefile b/groundStation/Makefile
index 4830eee98672171476ef58077e717f82f8915b2e..50c78782e80cb912a6eb2f42906b7c363e774a06 100644
--- a/groundStation/Makefile
+++ b/groundStation/Makefile
@@ -3,8 +3,8 @@
 # Generic Variables
 GCC=gcc
 GXX=g++
-CFLAGS= -Wall -Wpedantic -Wextra -Werror -std=gnu11 -g -Wno-unused-parameter -Wno-unused-variable -Wno-unused-function -Wno-unused-but-set-variable
-CXXFLAGS= -Wall -Wpedantic -Wextra -Werror -Wno-reorder -Wno-unused-variable -std=c++0x -g
+CFLAGS= -Wall -pedantic -Wextra -Werror -std=gnu99 -g -Wno-unused-parameter -Wno-unused-variable -Wno-unused-function -Wno-unused-but-set-variable
+CXXFLAGS= -Wall -pedantic -Wextra -Werror -Wno-reorder -Wno-unused-variable -std=c++0x -g
 INCLUDES = $(foreach dir, $(INCDIR), -I$(dir))
 INCDIR=inc src/vrpn src/vrpn/quat src/vrpn/build $(BESRCDIR) $(CLISRCDIR) $(FESRCDIR)
 LIBS= -lpthread -lbluetooth -lvrpn -lquat -Lsrc/vrpn/build -Lsrc/vrpn/build/quat 
diff --git a/groundStation/src/backend/backend.c b/groundStation/src/backend/backend.c
index 7bc7969aba3cea5f434d2b2903f760ff033059f6..9bcaa7a19556aa185d97d28857d40c21f50c5dbd 100644
--- a/groundStation/src/backend/backend.c
+++ b/groundStation/src/backend/backend.c
@@ -638,7 +638,7 @@ static void client_recv(int fd) {
 				if (tracker == NULL) {
 					char * dummy = TD_MAGIC " 1.0 2.0 3.0 4.0 5.0 6.0\n";
 					write(fd, dummy, strlen(dummy));
-				}else if (ucart_vrpn_tracker_getData(tracker, &td)) {
+				}else if (!ucart_vrpn_tracker_getData(tracker, &td)) {
 					write(fd, TD_MAGIC " ERROR\n", strlen(TD_MAGIC " ERROR\n"));
 				} else { 
 					/* more than sufficient buffer */
diff --git a/groundStation/src/cli/cli_monitor.c b/groundStation/src/cli/cli_monitor.c
index ea5a7b8c7eb4cb72cad5d2954305354bd58af3cd..23ca913dc2d9be279ef1d42e3230f4c4dc4fc6c0 100644
--- a/groundStation/src/cli/cli_monitor.c
+++ b/groundStation/src/cli/cli_monitor.c
@@ -10,8 +10,6 @@
 #include "cli_monitor.h"
 #include "frontend_tracker.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 countFlag = 0;
@@ -98,18 +96,3 @@ int monitor(struct backend_conn * conn) {
 
 	return 0;
 }
-
-static void timespec_diff(struct timespec *start, struct timespec *result)
-{
-	struct timespec stop;
-	clock_gettime(CLOCK_REALTIME, &stop);
-    if ((stop.tv_nsec - start->tv_nsec) < 0) {
-        result->tv_sec = stop.tv_sec - start->tv_sec - 1;
-        result->tv_nsec = stop.tv_nsec - start->tv_nsec + 1000000000;
-    } else {
-        result->tv_sec = stop.tv_sec - start->tv_sec;
-        result->tv_nsec = stop.tv_nsec - start->tv_nsec;
-    }
-
-    return;
-}