diff --git a/GPU/GPUTracking/Base/cuda/GPUReconstructionCUDA.cu b/GPU/GPUTracking/Base/cuda/GPUReconstructionCUDA.cu
index 3c118f402dc4f..e85a3c3e9e1f3 100644
--- a/GPU/GPUTracking/Base/cuda/GPUReconstructionCUDA.cu
+++ b/GPU/GPUTracking/Base/cuda/GPUReconstructionCUDA.cu
@@ -416,7 +416,7 @@ int32_t GPUReconstructionCUDA::InitDevice_Runtime()
     mInternals = master->mInternals;
     GPUFailedMsg(cudaSetDevice(mDeviceId));
 
-    GPUInfo("CUDA Initialized from master");
+    GPUInfo("CUDA Initialisation successfull (from master)");
   }
 
   for (uint32_t i = 0; i < mEvents.size(); i++) {
diff --git a/GPU/GPUTracking/Base/hip/GPUReconstructionHIPIncludesHost.h b/GPU/GPUTracking/Base/hip/GPUReconstructionHIPIncludesHost.h
index 7117dd0c718c6..c7a1b4f55e501 100644
--- a/GPU/GPUTracking/Base/hip/GPUReconstructionHIPIncludesHost.h
+++ b/GPU/GPUTracking/Base/hip/GPUReconstructionHIPIncludesHost.h
@@ -21,7 +21,7 @@
 #include <hip/hip_ext.h>
 #include <hipcub/hipcub.hpp>
 #pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wshadow"
+#pragma GCC diagnostic ignored "-Wshadow" // FIXME: Is this still needed?
 #include <thrust/sort.h>
 #include <thrust/execution_policy.h>
 #include <thrust/device_ptr.h>
diff --git a/GPU/GPUTracking/Merger/GPUTPCGMMergedTrack.h b/GPU/GPUTracking/Merger/GPUTPCGMMergedTrack.h
index 2d73279cf1fe7..64d8549312736 100644
--- a/GPU/GPUTracking/Merger/GPUTPCGMMergedTrack.h
+++ b/GPU/GPUTracking/Merger/GPUTPCGMMergedTrack.h
@@ -114,6 +114,7 @@ class GPUTPCGMMergedTrack
   float mLastY;                  //* outer Y
   float mLastZ;                  //* outer Z
   uint32_t mFirstClusterRef;     //* index of the first track cluster in corresponding cluster arrays
+  // TODO: Change to 8 bit
   uint32_t mNClusters;           //* number of track clusters
   uint32_t mNClustersFitted;     //* number of clusters used in fit
   uint8_t mFlags;
diff --git a/Utilities/rANS/benchmarks/bench_ransDecode.cxx b/Utilities/rANS/benchmarks/bench_ransDecode.cxx
index a642b58a3431d..0a11b042a77ee 100644
--- a/Utilities/rANS/benchmarks/bench_ransDecode.cxx
+++ b/Utilities/rANS/benchmarks/bench_ransDecode.cxx
@@ -112,8 +112,11 @@ void ransDecodeBenchmark(benchmark::State& st, Args&&... args)
   using input_data_type = std::remove_cv_t<std::remove_reference_t<decltype(inputData)>>;
   using source_type = typename input_data_type::value_type;
 
+#pragma GCC diagnostic push // TODO: Remove me when fixed in GCC
+#pragma GCC diagnostic ignored "-Walloc-size-larger-than="
   EncodeBuffer<source_type> encodeBuffer{inputData.size()};
   DecodeBuffer<source_type> decodeBuffer{inputData.size()};
+#pragma GCC diagnostic pop
 
   const auto histogram = makeDenseHistogram::fromSamples(gsl::span<const source_type>(inputData));
   Metrics<source_type> metrics{histogram};