diff --git a/src/coreComponents/fieldSpecification/AquiferBoundaryCondition.hpp b/src/coreComponents/fieldSpecification/AquiferBoundaryCondition.hpp
index 0e7a21f9603..ea0186e7082 100644
--- a/src/coreComponents/fieldSpecification/AquiferBoundaryCondition.hpp
+++ b/src/coreComponents/fieldSpecification/AquiferBoundaryCondition.hpp
@@ -118,7 +118,7 @@ class AquiferBoundaryCondition : public FieldSpecificationBase
 
   };
 
-  /// @copydoc FieldSpecificationBase(string const &, Group *)
+  /// @copydoc FieldSpecificationBase(string const &, dataRepository::Group *)
   AquiferBoundaryCondition( string const & name, Group * parent );
 
   /// deleted default constructor
diff --git a/src/coreComponents/fieldSpecification/EquilibriumInitialCondition.hpp b/src/coreComponents/fieldSpecification/EquilibriumInitialCondition.hpp
index f9e53715558..d91baca73ae 100644
--- a/src/coreComponents/fieldSpecification/EquilibriumInitialCondition.hpp
+++ b/src/coreComponents/fieldSpecification/EquilibriumInitialCondition.hpp
@@ -34,7 +34,7 @@ class EquilibriumInitialCondition : public FieldSpecificationBase
 {
 public:
 
-  /// @copydoc FieldSpecificationBase(string const &, Group *)
+  /// @copydoc FieldSpecificationBase(string const &, dataRepository::Group *)
   EquilibriumInitialCondition( string const & name, Group * parent );
 
   /// deleted default constructor
diff --git a/src/coreComponents/fieldSpecification/TractionBoundaryCondition.hpp b/src/coreComponents/fieldSpecification/TractionBoundaryCondition.hpp
index e1ba3890d7c..605b9666c5c 100644
--- a/src/coreComponents/fieldSpecification/TractionBoundaryCondition.hpp
+++ b/src/coreComponents/fieldSpecification/TractionBoundaryCondition.hpp
@@ -36,7 +36,7 @@ class TableFunction;
 class TractionBoundaryCondition : public FieldSpecificationBase
 {
 public:
-  /// @copydoc FieldSpecificationBase(string const &, Group *)
+  /// @copydoc FieldSpecificationBase(string const &, dataRepository::Group *)
   TractionBoundaryCondition( string const & name, Group * parent );
 
   /// deleted default constructor
diff --git a/src/coreComponents/physicsSolvers/fluidFlow/StabilizedCompositionalMultiphaseFVMKernels.hpp b/src/coreComponents/physicsSolvers/fluidFlow/StabilizedCompositionalMultiphaseFVMKernels.hpp
index 4bf769a3253..30b8b288c56 100644
--- a/src/coreComponents/physicsSolvers/fluidFlow/StabilizedCompositionalMultiphaseFVMKernels.hpp
+++ b/src/coreComponents/physicsSolvers/fluidFlow/StabilizedCompositionalMultiphaseFVMKernels.hpp
@@ -28,9 +28,6 @@ namespace geos
 namespace stabilizedCompositionalMultiphaseFVMKernels
 {
 
-;
-
-
 /******************************** FaceBasedAssemblyKernel ********************************/
 
 /**
diff --git a/src/coreComponents/physicsSolvers/fluidFlow/StabilizedSinglePhaseFVMKernels.hpp b/src/coreComponents/physicsSolvers/fluidFlow/StabilizedSinglePhaseFVMKernels.hpp
index a43b972f2b7..c2be6462655 100644
--- a/src/coreComponents/physicsSolvers/fluidFlow/StabilizedSinglePhaseFVMKernels.hpp
+++ b/src/coreComponents/physicsSolvers/fluidFlow/StabilizedSinglePhaseFVMKernels.hpp
@@ -28,8 +28,6 @@ namespace geos
 namespace stabilizedSinglePhaseFVMKernels
 {
 
-;
-
 
 /******************************** FaceBasedAssemblyKernel ********************************/
 
diff --git a/src/coreComponents/physicsSolvers/fluidFlow/ThermalCompositionalMultiphaseBaseKernels.hpp b/src/coreComponents/physicsSolvers/fluidFlow/ThermalCompositionalMultiphaseBaseKernels.hpp
index 7aabcb8fe30..5bf8be65aaf 100644
--- a/src/coreComponents/physicsSolvers/fluidFlow/ThermalCompositionalMultiphaseBaseKernels.hpp
+++ b/src/coreComponents/physicsSolvers/fluidFlow/ThermalCompositionalMultiphaseBaseKernels.hpp
@@ -30,8 +30,6 @@ namespace geos
 namespace thermalCompositionalMultiphaseBaseKernels
 {
 
-;
-
 
 /******************************** PhaseVolumeFractionKernel ********************************/
 
diff --git a/src/coreComponents/physicsSolvers/fluidFlow/ThermalCompositionalMultiphaseFVMKernels.hpp b/src/coreComponents/physicsSolvers/fluidFlow/ThermalCompositionalMultiphaseFVMKernels.hpp
index 6278d5c544b..795aaad63cb 100644
--- a/src/coreComponents/physicsSolvers/fluidFlow/ThermalCompositionalMultiphaseFVMKernels.hpp
+++ b/src/coreComponents/physicsSolvers/fluidFlow/ThermalCompositionalMultiphaseFVMKernels.hpp
@@ -31,8 +31,6 @@ namespace geos
 namespace thermalCompositionalMultiphaseFVMKernels
 {
 
-;
-
 /******************************** PhaseMobilityKernel ********************************/
 
 /**
diff --git a/src/coreComponents/physicsSolvers/fluidFlow/ThermalSinglePhaseFVMKernels.hpp b/src/coreComponents/physicsSolvers/fluidFlow/ThermalSinglePhaseFVMKernels.hpp
index 587baab4206..0ccb49617ac 100644
--- a/src/coreComponents/physicsSolvers/fluidFlow/ThermalSinglePhaseFVMKernels.hpp
+++ b/src/coreComponents/physicsSolvers/fluidFlow/ThermalSinglePhaseFVMKernels.hpp
@@ -30,8 +30,6 @@ namespace geos
 
 namespace thermalSinglePhaseFVMKernels
 {
-;
-
 /******************************** FaceBasedAssemblyKernel ********************************/
 
 /**
diff --git a/src/coreComponents/physicsSolvers/fluidFlow/proppantTransport/ProppantTransportKernels.hpp b/src/coreComponents/physicsSolvers/fluidFlow/proppantTransport/ProppantTransportKernels.hpp
index 9a1c2426f60..75769763fed 100644
--- a/src/coreComponents/physicsSolvers/fluidFlow/proppantTransport/ProppantTransportKernels.hpp
+++ b/src/coreComponents/physicsSolvers/fluidFlow/proppantTransport/ProppantTransportKernels.hpp
@@ -40,8 +40,6 @@ namespace geos
 
 namespace proppantTransportKernels
 {
-;
-
 /******************************** FluidUpdateKernel ********************************/
 
 struct FluidUpdateKernel
diff --git a/src/coreComponents/physicsSolvers/fluidFlow/wells/CompositionalMultiphaseWellKernels.hpp b/src/coreComponents/physicsSolvers/fluidFlow/wells/CompositionalMultiphaseWellKernels.hpp
index bf28fb1cb81..48de11b7987 100644
--- a/src/coreComponents/physicsSolvers/fluidFlow/wells/CompositionalMultiphaseWellKernels.hpp
+++ b/src/coreComponents/physicsSolvers/fluidFlow/wells/CompositionalMultiphaseWellKernels.hpp
@@ -43,8 +43,6 @@ namespace geos
 namespace compositionalMultiphaseWellKernels
 {
 
-;
-
 static constexpr real64 minDensForDivision = 1e-10;
 
 // tag to access well and reservoir elements in perforation rates computation