diff --git a/.clang-tidy b/.clang-tidy
index 9048f4f3b0c5cc12bb8633921049a622937d1989..f3bee573b948b80c3c643aa5bba6d7855efa3b94 100644
--- a/.clang-tidy
+++ b/.clang-tidy
@@ -121,7 +121,6 @@ Checks: '*,
 -bugprone-misplaced-widening-cast,
 -clang-analyzer-core.CallAndMessage,
 -clang-analyzer-optin.cplusplus.VirtualCall,
--clang-diagnostic-error,
 -cppcoreguidelines-pro-type-const-cast,
 -cppcoreguidelines-pro-type-static-cast-downcast,
 -google-runtime-references,
diff --git a/Device/Data/Datafield.cpp b/Device/Data/Datafield.cpp
index 27d6c2c9f1e4de28ed8c1084405d9e5e2343a475..43eb227b0f3f93c903f3fa70df1f50a5bd0fc881 100644
--- a/Device/Data/Datafield.cpp
+++ b/Device/Data/Datafield.cpp
@@ -27,9 +27,6 @@
 
 namespace {
 
-auto const seed = 123;
-auto urbg = std::mt19937(seed);
-
 PyObject* npExport(const Frame& frame, const std::vector<double>& flatData)
 {
     if (flatData.empty())
@@ -429,6 +426,9 @@ Datafield Datafield::flat() const
 
 Datafield Datafield::noisy(double prefactor, double minimum) const
 {
+    auto const seed = 123;
+    static auto urbg = std::mt19937(seed);
+
     std::vector<double> outval(size());
     std::vector<double> errval(size());
     for (size_t i = 0; i < size(); ++i) {
diff --git a/Device/Resolution/ConvolutionDetectorResolution.h b/Device/Resolution/ConvolutionDetectorResolution.h
index 8bb29dd9128351da18b336a0c8cef7a68859b81c..f32e4adad1f7760df9c3db4f3c96d03ee1f4fda5 100644
--- a/Device/Resolution/ConvolutionDetectorResolution.h
+++ b/Device/Resolution/ConvolutionDetectorResolution.h
@@ -41,7 +41,7 @@ public:
     std::string className() const final { return "ConvolutionDetectorResolution"; }
 
     //! Convolve given intensities with the encapsulated resolution.
-    void execDetectorResolution(Datafield* p_intensity_map) const override;
+    void execDetectorResolution(Datafield* df) const override;
 
     const IResolutionFunction2D* getResolutionFunction2D() const;
 
@@ -52,8 +52,8 @@ protected:
 
 private:
     void setResolutionFunction(const IResolutionFunction2D& resFunc);
-    void apply1dConvolution(Datafield* p_intensity_map) const;
-    void apply2dConvolution(Datafield* p_intensity_map) const;
+    void apply1dConvolution(Datafield* df) const;
+    void apply2dConvolution(Datafield* df) const;
     double getIntegratedPDF1d(double x, double step) const;
     double getIntegratedPDF2d(double x, double step_x, double y, double step_y) const;