diff --git a/CMakeLists.txt b/CMakeLists.txt
index ae4adab126d01b43f9cb6b1e78aa7854918fd806..497f535d87bdbd9f6bdb480e438413aa53351e07 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -18,8 +18,8 @@ IF (NOT CMAKE_BUILD_TYPE)
  SET(CMAKE_BUILD_TYPE "DEBUG") 
 ENDIF (NOT CMAKE_BUILD_TYPE)
 
-SET(CMAKE_C_FLAGS_DEBUG "-g -Wall -D_REENTRANT")
-SET(CMAKE_C_FLAGS_RELEASE "-O3 -D_REENTRANT")
+SET(CMAKE_CXX_FLAGS_DEBUG "-g -Wall -D_REENTRANT")
+SET(CMAKE_CXX_FLAGS_RELEASE "-O3 -D_REENTRANT")
 
 ADD_SUBDIRECTORY(src)
 
diff --git a/src/asterx1_gps.cpp b/src/asterx1_gps.cpp
index ed57e5879bd1b52ff53370922a12ccec6730887a..c9703612d253e6ffc90deaad58b985c1ca2cf6dc 100644
--- a/src/asterx1_gps.cpp
+++ b/src/asterx1_gps.cpp
@@ -499,9 +499,8 @@ int CasteRx1::synchronizeHeader(const unsigned char *mark, int msecTimeOut, unsi
 {
 	unsigned char cc; 
 	string readMark, targetMark;
-	bool endLoop = false;
 	int retValue = BASIC_SUCCESS;
-	int ii=0;
+	unsigned int ii=0;
 
 	//sets targetMark
 	targetMark.append((const char*)mark,markSize);
@@ -528,7 +527,6 @@ int CasteRx1::synchronizeHeader(const unsigned char *mark, int msecTimeOut, unsi
 int CasteRx1::sendCommand(const string & cmnd)
 {
 	int retValue;
-	int nn;
 	unsigned char replyBuffer[200];
 	string receivedReply, expectedReply;