diff --git a/ql/math/randomnumbers/burley2020sobolrsg.cpp b/ql/math/randomnumbers/burley2020sobolrsg.cpp
index ec441ee21b7..b8c52452a8c 100644
--- a/ql/math/randomnumbers/burley2020sobolrsg.cpp
+++ b/ql/math/randomnumbers/burley2020sobolrsg.cpp
@@ -54,26 +54,26 @@ namespace QuantLib {
 
         // for reverseBits() see http://graphics.stanford.edu/~seander/bithacks.html#BitReverseTable
 
-        static const std::uint8_t bitReverseTable[] = {
-            0u,   128u, 64u,  192u, 32u,  160u, 96u,  224u, 16u,  144u, 80u,  208u, 48u,  176u,
-            112u, 240u, 8u,   136u, 72u,  200u, 40u,  168u, 104u, 232u, 24u,  152u, 88u,  216u,
-            56u,  184u, 120u, 248u, 4u,   132u, 68u,  196u, 36u,  164u, 100u, 228u, 20u,  148u,
-            84u,  212u, 52u,  180u, 116u, 244u, 12u,  140u, 76u,  204u, 44u,  172u, 108u, 236u,
-            28u,  156u, 92u,  220u, 60u,  188u, 124u, 252u, 2u,   130u, 66u,  194u, 34u,  162u,
-            98u,  226u, 18u,  146u, 82u,  210u, 50u,  178u, 114u, 242u, 10u,  138u, 74u,  202u,
-            42u,  170u, 106u, 234u, 26u,  154u, 90u,  218u, 58u,  186u, 122u, 250u, 6u,   134u,
-            70u,  198u, 38u,  166u, 102u, 230u, 22u,  150u, 86u,  214u, 54u,  182u, 118u, 246u,
-            14u,  142u, 78u,  206u, 46u,  174u, 110u, 238u, 30u,  158u, 94u,  222u, 62u,  190u,
-            126u, 254u, 1u,   129u, 65u,  193u, 33u,  161u, 97u,  225u, 17u,  145u, 81u,  209u,
-            49u,  177u, 113u, 241u, 9u,   137u, 73u,  201u, 41u,  169u, 105u, 233u, 25u,  153u,
-            89u,  217u, 57u,  185u, 121u, 249u, 5u,   133u, 69u,  197u, 37u,  165u, 101u, 229u,
-            21u,  149u, 85u,  213u, 53u,  181u, 117u, 245u, 13u,  141u, 77u,  205u, 45u,  173u,
-            109u, 237u, 29u,  157u, 93u,  221u, 61u,  189u, 125u, 253u, 3u,   131u, 67u,  195u,
-            35u,  163u, 99u,  227u, 19u,  147u, 83u,  211u, 51u,  179u, 115u, 243u, 11u,  139u,
-            75u,  203u, 43u,  171u, 107u, 235u, 27u,  155u, 91u,  219u, 59u,  187u, 123u, 251u,
-            7u,   135u, 71u,  199u, 39u,  167u, 103u, 231u, 23u,  151u, 87u,  215u, 55u,  183u,
-            119u, 247u, 15u,  143u, 79u,  207u, 47u,  175u, 111u, 239u, 31u,  159u, 95u,  223u,
-            63u,  191u, 127u, 255u};
+        const std::uint8_t bitReverseTable[] = {
+            0U,   128U, 64U,  192U, 32U,  160U, 96U,  224U, 16U,  144U, 80U,  208U, 48U,  176U,
+            112U, 240U, 8U,   136U, 72U,  200U, 40U,  168U, 104U, 232U, 24U,  152U, 88U,  216U,
+            56U,  184U, 120U, 248U, 4U,   132U, 68U,  196U, 36U,  164U, 100U, 228U, 20U,  148U,
+            84U,  212U, 52U,  180U, 116U, 244U, 12U,  140U, 76U,  204U, 44U,  172U, 108U, 236U,
+            28U,  156U, 92U,  220U, 60U,  188U, 124U, 252U, 2U,   130U, 66U,  194U, 34U,  162U,
+            98U,  226U, 18U,  146U, 82U,  210U, 50U,  178U, 114U, 242U, 10U,  138U, 74U,  202U,
+            42U,  170U, 106U, 234U, 26U,  154U, 90U,  218U, 58U,  186U, 122U, 250U, 6U,   134U,
+            70U,  198U, 38U,  166U, 102U, 230U, 22U,  150U, 86U,  214U, 54U,  182U, 118U, 246U,
+            14U,  142U, 78U,  206U, 46U,  174U, 110U, 238U, 30U,  158U, 94U,  222U, 62U,  190U,
+            126U, 254U, 1U,   129U, 65U,  193U, 33U,  161U, 97U,  225U, 17U,  145U, 81U,  209U,
+            49U,  177U, 113U, 241U, 9U,   137U, 73U,  201U, 41U,  169U, 105U, 233U, 25U,  153U,
+            89U,  217U, 57U,  185U, 121U, 249U, 5U,   133U, 69U,  197U, 37U,  165U, 101U, 229U,
+            21U,  149U, 85U,  213U, 53U,  181U, 117U, 245U, 13U,  141U, 77U,  205U, 45U,  173U,
+            109U, 237U, 29U,  157U, 93U,  221U, 61U,  189U, 125U, 253U, 3U,   131U, 67U,  195U,
+            35U,  163U, 99U,  227U, 19U,  147U, 83U,  211U, 51U,  179U, 115U, 243U, 11U,  139U,
+            75U,  203U, 43U,  171U, 107U, 235U, 27U,  155U, 91U,  219U, 59U,  187U, 123U, 251U,
+            7U,   135U, 71U,  199U, 39U,  167U, 103U, 231U, 23U,  151U, 87U,  215U, 55U,  183U,
+            119U, 247U, 15U,  143U, 79U,  207U, 47U,  175U, 111U, 239U, 31U,  159U, 95U,  223U,
+            63U,  191U, 127U, 255U};
 
         inline std::uint32_t reverseBits(std::uint32_t x) {
             return (bitReverseTable[x & 0xff] << 24) | (bitReverseTable[(x >> 8) & 0xff] << 16) |
@@ -82,10 +82,10 @@ namespace QuantLib {
 
         inline std::uint32_t laine_karras_permutation(std::uint32_t x, std::uint32_t seed) {
             x += seed;
-            x ^= x * 0x6c50b47cu;
-            x ^= x * 0xb82f1e52u;
-            x ^= x * 0xc7afe638u;
-            x ^= x * 0x8d22f6e6u;
+            x ^= x * 0x6c50b47cU;
+            x ^= x * 0xb82f1e52U;
+            x ^= x * 0xc7afe638U;
+            x ^= x * 0x8d22f6e6U;
             return x;
         }
 
diff --git a/ql/math/randomnumbers/sobolrsg.cpp b/ql/math/randomnumbers/sobolrsg.cpp
index 1e0810e843c..b98f9bbf165 100644
--- a/ql/math/randomnumbers/sobolrsg.cpp
+++ b/ql/math/randomnumbers/sobolrsg.cpp
@@ -78793,7 +78793,7 @@ namespace QuantLib {
                 }
             }
         } else {
-            std::fill(integerSequence_.begin(), integerSequence_.end(), 0u);
+            std::fill(integerSequence_.begin(), integerSequence_.end(), 0U);
             std::uint_least32_t mask = 1;
             for (Size index = 0; index < bits_; index++) {
                 if ((N & mask) != 0U) {