diff --git a/modules/mol/base/src/impl/entity_impl.hh b/modules/mol/base/src/impl/entity_impl.hh
index ae1208f5e4bb70b8f603055fb7f0d98299e70d9c..1dd0c21da30b21d60c6b413d112ab8d9b2bf68b6 100644
--- a/modules/mol/base/src/impl/entity_impl.hh
+++ b/modules/mol/base/src/impl/entity_impl.hh
@@ -75,7 +75,7 @@ typedef enum {
   // dirty trace (implies dirty ICS)
   DirtyTrace=DirtyICS+4,
   DirtyOrganizer=8,
-  DisableICS=16,
+  DisableICS=16
 } EntityDirtyFlags;
 
 
diff --git a/modules/mol/base/src/impl/query_impl.hh b/modules/mol/base/src/impl/query_impl.hh
index 2a025bf4ab1795441bec919a2d52d5a4abd6997a..d9a28760a921a334e1e981e101ab193ef5487cce 100644
--- a/modules/mol/base/src/impl/query_impl.hh
+++ b/modules/mol/base/src/impl/query_impl.hh
@@ -66,7 +66,7 @@ namespace tok {
     None,
     UnknownChar,
     UnterminatedQuote,
-    String,
+    String
   }
   Type;
 }
diff --git a/modules/mol/base/tests/test_delete.cc b/modules/mol/base/tests/test_delete.cc
index 6366822012674e28accc83d826a6b98612e6c18d..c117f5d9ae50dfd0d26a41c665627b957d3dd751 100644
--- a/modules/mol/base/tests/test_delete.cc
+++ b/modules/mol/base/tests/test_delete.cc
@@ -65,20 +65,16 @@ struct Fixture {
   AtomHandle ad;
   TorsionHandle t;
 };
-void test_atom_delete() {
+
+BOOST_AUTO_TEST_SUITE( mol_base )
+
+BOOST_AUTO_TEST_CASE(atom_delete) 
+{
   Fixture f;
   XCSEditor e=f.e.RequestXCSEditor();
   e.DeleteAtom(f.ab);
   E ev;
   BOOST_CHECK_NO_THROW(f.e.Apply(ev));
-
-}
-
-BOOST_AUTO_TEST_SUITE( mol_base )
-
-BOOST_AUTO_TEST_CASE(test_atom_delete) 
-{
-  test_atom_delete();
 }
 
 BOOST_AUTO_TEST_SUITE_END()
\ No newline at end of file
diff --git a/modules/qa/src/amino_acids.hh b/modules/qa/src/amino_acids.hh
index 809e8066a34403253140a491870c0f4bd00f908d..d2337068c8743f8f80a2827112862b60259d88ca 100644
--- a/modules/qa/src/amino_acids.hh
+++ b/modules/qa/src/amino_acids.hh
@@ -38,7 +38,7 @@ typedef enum  {
 	Met, Trp, Tyr,
 	Thr, Val, Ile,
 	Leu, Gly, Pro,
-	His, Phe, Xxx,
+	His, Phe, Xxx
 	
 } AminoAcid;
 
diff --git a/modules/qa/src/solis_torsion_potential.cc b/modules/qa/src/solis_torsion_potential.cc
index 61a4768dd62f3745480cad1cc0555ccfbb3324ec..a7b0ffde0d9dfb258aaddef4e1f35f3005f79132 100644
--- a/modules/qa/src/solis_torsion_potential.cc
+++ b/modules/qa/src/solis_torsion_potential.cc
@@ -33,9 +33,9 @@ namespace ost { namespace qa {
   
 namespace {
 
-class TorsionEnergyCalc : public mol::EntityVisitor {
+class SolisTorsionEnergyCalc : public mol::EntityVisitor {
 public:
-  TorsionEnergyCalc(TorsionPotentialSolis::TorsionEnergies& energies,
+  SolisTorsionEnergyCalc(TorsionPotentialSolis::TorsionEnergies& energies,
                     TorsionPotentialOptsSolis opts):
     energies_(energies), prev_(Xxx), center_(Xxx), energy_(0.0),
     opts_(opts), num_torsions_(0)
@@ -193,7 +193,7 @@ void TorsionPotentialSolis::SaveToFile(const String& path)
 
 Real TorsionPotentialSolis::GetTotalEnergy(mol::EntityHandle entity)
 {
-  TorsionEnergyCalc c(energies_, options_);  
+  SolisTorsionEnergyCalc c(energies_, options_);  
   entity.Apply(c);
   num_torsions_ = c.GetEnergyCounts();
   return c.GetEnergy();
@@ -201,7 +201,7 @@ Real TorsionPotentialSolis::GetTotalEnergy(mol::EntityHandle entity)
 
 Real TorsionPotentialSolis::GetTotalEnergy(mol::EntityView entity)
 {
-  TorsionEnergyCalc c(energies_, options_);
+  SolisTorsionEnergyCalc c(energies_, options_);
   entity.Apply(c);
   num_torsions_ = c.GetEnergyCounts();
   return c.GetEnergy();
diff --git a/modules/qa/src/solis_torsion_statistics.cc b/modules/qa/src/solis_torsion_statistics.cc
index dde884087b5f8d3365529da97c5564e95f8e0a4b..9b48639b899c12c4070dfecd612028683a88bda6 100644
--- a/modules/qa/src/solis_torsion_statistics.cc
+++ b/modules/qa/src/solis_torsion_statistics.cc
@@ -34,9 +34,9 @@ namespace ost { namespace qa {
 
 namespace {
 
-class TorsionStat : public mol::EntityVisitor {
+class TorsionStatSolis : public mol::EntityVisitor {
 public:
-  TorsionStat(TorsionStatisticsSolis::TorsionHistogram& histo):
+  TorsionStatSolis(TorsionStatisticsSolis::TorsionHistogram& histo):
     histo_(histo)
   {}
   
@@ -94,13 +94,13 @@ int TorsionStatisticsSolis::GetTorsionBucketSize() const
 
 void TorsionStatisticsSolis::Extract(mol::EntityView view)
 {
-  TorsionStat stat(histogram_);
+  TorsionStatSolis stat(histogram_);
   view.Apply(stat);
 }
 
 void TorsionStatisticsSolis::Extract(mol::EntityHandle entity)
 {
-  TorsionStat stat(histogram_);
+  TorsionStatSolis stat(histogram_);
   entity.Apply(stat);
 }
 
diff --git a/modules/seq/alg/src/sequence_identity.hh b/modules/seq/alg/src/sequence_identity.hh
index 4b775ef9228f7116d1094067ef1ec49828450e90..82c6d9cde92801f68f33882d1df43089e866d007 100644
--- a/modules/seq/alg/src/sequence_identity.hh
+++ b/modules/seq/alg/src/sequence_identity.hh
@@ -30,7 +30,7 @@ namespace ost { namespace seq { namespace alg {
 struct RefMode {
   enum Type {
     ALIGNMENT=0,
-    LONGER_SEQUENCE,
+    LONGER_SEQUENCE
   };
 };