diff --git a/src/dynamic_fusion/runtime/gpu/cl/ClKernelRuntime.h b/src/dynamic_fusion/runtime/gpu/cl/ClKernelRuntime.h
index acc2380..4787aca 100644
--- a/src/dynamic_fusion/runtime/gpu/cl/ClKernelRuntime.h
+++ b/src/dynamic_fusion/runtime/gpu/cl/ClKernelRuntime.h
@@ -35,7 +35,8 @@
 {
 namespace dynamic_fusion
 {
-struct GpuKernelSourceCode;
+/** Forward declaration */
+class GpuKernelSourceCode;
 
 /** OpenCL runtime to run a single kernel */
 class ClKernelRuntime final : public opencl::IClKernel
diff --git a/src/dynamic_fusion/runtime/gpu/cl/ClWorkloadRuntime.cpp b/src/dynamic_fusion/runtime/gpu/cl/ClWorkloadRuntime.cpp
index 549c6d4..f14f66d 100644
--- a/src/dynamic_fusion/runtime/gpu/cl/ClWorkloadRuntime.cpp
+++ b/src/dynamic_fusion/runtime/gpu/cl/ClWorkloadRuntime.cpp
@@ -287,15 +287,20 @@
         switch(stage)
         {
             case UnitWorkloadStage::Stage::Run:
+            {
                 _impl->_kernels.emplace(work.id(), std::move(k));
                 break;
+            }
             case UnitWorkloadStage::Stage::Prepare:
+            {
                 _impl->_kernels_prep.emplace(work.id(), std::move(k));
                 break;
+            }
             default:
+            {
                 ARM_COMPUTE_ERROR("Invalid unit workload stage");
+            }
         }
-        break;
     }
     // Create auxiliary tensor objects
     create_aux_tensors(&_impl->_aux_tensors, _impl->_source_code);
diff --git a/src/dynamic_fusion/sketch/gpu/operators/GpuConv2d.cpp b/src/dynamic_fusion/sketch/gpu/operators/GpuConv2d.cpp
index 98c1cc3..12aa4d1 100644
--- a/src/dynamic_fusion/sketch/gpu/operators/GpuConv2d.cpp
+++ b/src/dynamic_fusion/sketch/gpu/operators/GpuConv2d.cpp
@@ -25,7 +25,6 @@
 
 #include "arm_compute/core/CL/CLCompileContext.h"
 #include "arm_compute/core/Validate.h"
-#include "arm_compute/core/Validate.h"
 #include "arm_compute/core/experimental/Types.h"
 #include "arm_compute/core/utils/misc/ShapeCalculator.h"
 
@@ -87,7 +86,7 @@
     return true;
 }
 
-GpuOperatorType operator_type = GpuOperatorType::Complex;
+constexpr GpuOperatorType operator_type = GpuOperatorType::Complex;
 } // namespace
 
 Status GpuConv2d::validate_op(const GpuWorkloadSketch &sketch,