diff --git a/tools/dcdbconfig/useraction.h b/tools/dcdbconfig/useraction.h
index f4a398c1111503411e703fcad74b504be99ea9af..0c83ae41c8c04f1666814e2dd6e36efe11e4563d 100644
--- a/tools/dcdbconfig/useraction.h
+++ b/tools/dcdbconfig/useraction.h
@@ -33,6 +33,7 @@
 class UserAction
 {
 public:
+  virtual ~UserAction() {}
   virtual void printHelp(int argc, char* argv[]) = 0;
   virtual int executeCommand(int argc, char* argv[], int argvidx, const char* hostname) = 0;
 };
diff --git a/tools/dcdbcsvimport/dcdbcsvimport.cpp b/tools/dcdbcsvimport/dcdbcsvimport.cpp
index 38ce5c2a8b6e19371506c82fc67237da6e2f264d..174b2e900e744f049d81b527fbc449ba6913ef58 100644
--- a/tools/dcdbcsvimport/dcdbcsvimport.cpp
+++ b/tools/dcdbcsvimport/dcdbcsvimport.cpp
@@ -213,7 +213,7 @@ int main(int argc, char** argv)
   for (it = sensors.begin(); it != sensors.end(); it++) {
 	  std::cout << it->name << " " << it->topic << " " << it->publicName << std::endl;
 	  sensorConfig.publishSensor(it->publicName.c_str(), it->topic.c_str());
-  }
+  } */
 
   /* Disconnect */
   delete connection;
diff --git a/tools/dcdbquery/query.cpp b/tools/dcdbquery/query.cpp
index 999d43eb142a7534241cfc1cbd95b3379d475a31..a0fcd1bf226f99f2f4c49fe741445ee5f8d03aa6 100644
--- a/tools/dcdbquery/query.cpp
+++ b/tools/dcdbquery/query.cpp
@@ -95,6 +95,8 @@ void DCDBQuery::genOutput(std::list<DCDB::SensorDataStoreReading> &results, quer
 	    case DCDB_OP_INTEGRAL:
 		std::cout << ",Integral";
 		break;
+		default:
+		break;
 	}
 	if(it->second.unit != DCDB::Unit_None) {
 	    std::cout << " (" << DCDB::UnitConv::toString(it->second.unit) << ")";
@@ -161,6 +163,8 @@ void DCDBQuery::genOutput(std::list<DCDB::SensorDataStoreReading> &results, quer
 			    std::cout << ",";
 			}
 			break;}
+			default:
+			break;
 		}
 	    } else {
 		std::cout << ",";
@@ -192,8 +196,8 @@ void DCDBQuery::doQuery(const char* hostname, std::list<std::string> sensors, DC
 	std::string sensorName;
 	std::string functName;
 	std::string modifierStr;
-	double scalingFactor = 1.0;
-	DCDB::Unit unit = DCDB::Unit_None;
+	//double scalingFactor = 1.0;
+	//DCDB::Unit unit = DCDB::Unit_None;
 	
 	/* Retrieve sensor object first */
 	std::string str = *it;