diff --git a/src/logbook/counties.cxx b/src/logbook/counties.cxx
index 4a0efd4a..a3d54f66 100644
--- a/src/logbook/counties.cxx
+++ b/src/logbook/counties.cxx
@@ -413,7 +413,7 @@ const std::string Cstates::cnty_short( std::string st, std::string cnty) // st/c
 		if (!OK) return answer;
 
 		ST = vec_7QP[n].ST;
-		for (size_t k = n; ST == vec_7QP[k].ST, k < vec_7QP.size(); k++) {
+		for (size_t k = n; k < vec_7QP.size(); k++) {
 			dCNTY = ucasestr(vec_7QP[k].CTY);
 			dCOUNTY = ucasestr(vec_7QP[k].county);
 			if (CNTY == dCNTY) {
@@ -435,7 +435,7 @@ const std::string Cstates::cnty_short( std::string st, std::string cnty) // st/c
 		if (!OK) return answer;
 
 		ST = vec_6QP[n].ST;
-		for (size_t k = n; ST == vec_6QP[k].ST, k < vec_6QP.size(); k++) {
+		for (size_t k = n; k < vec_6QP.size(); k++) {
 			dCNTY = ucasestr(vec_6QP[k].CTY);
 			dCOUNTY = ucasestr(vec_6QP[k].county);
 			if (CNTY == dCNTY) {
@@ -457,7 +457,7 @@ const std::string Cstates::cnty_short( std::string st, std::string cnty) // st/c
 		if (!OK) return answer;
 
 		ST = vec_SQSO[n].ST;
-		for (size_t k = n; ST == vec_SQSO[k].ST, k < vec_SQSO.size(); k++) {
+		for (size_t k = n; k < vec_SQSO.size(); k++) {
 			dCNTY = ucasestr(vec_SQSO[k].CTY);
 			dCOUNTY = ucasestr(vec_SQSO[k].county);
 			if (CNTY == dCNTY) {
@@ -489,7 +489,7 @@ const std::string Cstates::county( std::string st, std::string cnty) // st/cnty
 		if (ST != dST) return "";
 
 		ST = vec_7QP[n].ST;
-		for (size_t k = n; ST == vec_7QP[k].ST, k < vec_7QP.size(); k++) {
+		for (size_t k = n; k < vec_7QP.size(); k++) {
 			dCNTY = ucasestr(vec_7QP[k].CTY);
 			dCOUNTY = ucasestr(vec_7QP[k].county);
 			if (CNTY == dCNTY) return vec_7QP[k].county;
@@ -504,7 +504,7 @@ const std::string Cstates::county( std::string st, std::string cnty) // st/cnty
 		if (ST != dST) return "";
 
 		ST = vec_6QP[n].ST;
-		for (size_t k = n; ST == vec_6QP[k].ST, k < vec_6QP.size(); k++) {
+		for (size_t k = n; k < vec_6QP.size(); k++) {
 			if (vec_6QP[k].ST.empty()) return "";
 			dCNTY = ucasestr(vec_6QP[k].CTY);
 			dCOUNTY = ucasestr(vec_6QP[k].county);
@@ -521,7 +521,7 @@ const std::string Cstates::county( std::string st, std::string cnty) // st/cnty
 		if (ST != dST) return "";
 
 		ST = vec_SQSO[n].ST;
-		for (size_t k = n; ST == vec_SQSO[k].ST, k < vec_SQSO.size(); k++) {
+		for (size_t k = n; k < vec_SQSO.size(); k++) {
 			if (vec_SQSO[k].ST.empty()) return "";
 			dCNTY = ucasestr(vec_SQSO[k].CTY);
 			dCOUNTY = ucasestr(vec_SQSO[k].county);
diff --git a/src/logbook/table.cxx b/src/logbook/table.cxx
index 6deee6d8..526aa74e 100644
--- a/src/logbook/table.cxx
+++ b/src/logbook/table.cxx
@@ -1121,10 +1121,13 @@ int Table::handle(int event) {
       // Create a tab separated list from data.
       buffer = (char*)malloc(len);
       if (buffer != nullptr) {
-          strcpy(buffer, tableRow[0]);
-          for (int col = 1; col < nCols; col++) {
-            strcat(buffer, "\t");
-            strcat(buffer, tableRow[col]);
+          for (int col = 0; col < nCols; col++) {
+			  if (col == 0)
+				strcpy(buffer, tableRow[col]);
+			else
+				strcat(buffer, "\t");
+				strcat(buffer, tableRow[col]);
+			}
           }
           Fl::selection(*this, buffer, len);
           free(buffer);
diff --git a/src/rigcontrol/hamlib.cxx b/src/rigcontrol/hamlib.cxx
index 4a6dfe04..0497e6d1 100644
--- a/src/rigcontrol/hamlib.cxx
+++ b/src/rigcontrol/hamlib.cxx
@@ -568,11 +568,7 @@ static void *hamlib_loop(void *args)
 	return NULL;
 }
 
-#ifdef RIGCAPS_NOT_CONST
-static int add_to_list(struct rig_caps* rc, void*)
-#else
 static int add_to_list(const struct rig_caps* rc, void*)
-#endif
 {
 	hamlib_rigs.push_back(rc);
 	return 1;