diff --git a/include/podio/CollectionBuffers.h b/include/podio/CollectionBuffers.h
index d761c3916..7516b11a4 100644
--- a/include/podio/CollectionBuffers.h
+++ b/include/podio/CollectionBuffers.h
@@ -108,7 +108,7 @@ struct CollectionReadBuffers {
   // field again.
   RecastFuncT recast{};
 
-  // Workaround for https://github.com/AIDASoft/podio#500
+  // Workaround for https://github.com/AIDASoft/podio/issues/500
   // We need a function that explicitly deletes the buffers, but for this we
   // need type information, so we attach a delete function at generation time
   DeleteFuncT deleteBuffers{};
diff --git a/podioVersion.in.h b/podioVersion.in.h
index 4a26f4f9b..d46404d2f 100644
--- a/podioVersion.in.h
+++ b/podioVersion.in.h
@@ -5,9 +5,6 @@
 #include <ostream>
 #include <sstream>
 #include <tuple>
-#if __cplusplus >= 202002L
-  #include <compare>
-#endif
 
 // Some preprocessor constants and macros for the use cases where they might be
 // necessary
diff --git a/src/ROOTFrameData.cc b/src/ROOTFrameData.cc
index 2fde64154..c01f42e59 100644
--- a/src/ROOTFrameData.cc
+++ b/src/ROOTFrameData.cc
@@ -6,7 +6,7 @@ ROOTFrameData::ROOTFrameData(BufferMap&& buffers, CollIDPtr&& idTable, podio::Ge
     m_buffers(std::move(buffers)), m_idTable(std::move(idTable)), m_parameters(std::move(params)) {
 }
 
-// Interim workaround for https://github.com/AIDASoft/podio#500
+// Interim workaround for https://github.com/AIDASoft/podio/issues/500
 ROOTFrameData::~ROOTFrameData() {
   for (auto& [_, buffer] : m_buffers) {
     buffer.deleteBuffers(buffer);
diff --git a/tests/write_frame.h b/tests/write_frame.h
index bb67884de..54a4b67d5 100644
--- a/tests/write_frame.h
+++ b/tests/write_frame.h
@@ -25,11 +25,9 @@
 #include "podio/Frame.h"
 #include "podio/LinkCollection.h"
 #include "podio/UserDataCollection.h"
-#include "podio/utilities/TypeHelpers.h"
 
 #include <string>
 #include <tuple>
-#include <type_traits>
 
 auto createMCCollection() {
   auto mcps = ExampleMCCollection();