diff --git a/emper/Actor.hpp b/emper/Actor.hpp
index 3839a13809d4c09e69eda4584d5a2b8710ae27c8..da6c6551bd7df0d7e1c7443201ae2a5d13bac464 100644
--- a/emper/Actor.hpp
+++ b/emper/Actor.hpp
@@ -80,6 +80,9 @@ class Actor {
 		const auto start = std::chrono::steady_clock::now();
 		const auto deadline = start + std::chrono::milliseconds(timeout);
 		while (!(queue.size() == 0 && state.load(std::memory_order_acquire) == Retrieving)) {
+			// TODO: The suppressed linter error below may be a false positive
+			// reported by clang-tidy.
+			// NOLINTNEXTLINE(modernize-use-nullptr)
 			if (std::chrono::steady_clock::now() > deadline) {
 				return false;
 			}
diff --git a/emper/Worker.hpp b/emper/Worker.hpp
index 0cec08e3b279bf309bf1985a455ac91d553a93af..7527d8c3eda142cd3505816f1d4b39d20d74c7e5 100644
--- a/emper/Worker.hpp
+++ b/emper/Worker.hpp
@@ -2,6 +2,7 @@
 // Copyright © 2020 Florian Schmaus
 #pragma once
 
+#include "Common.hpp"
 #include "emper-common.h"
 
 class Runtime;
@@ -12,7 +13,7 @@ class Worker {
 
 	const workerid_t workerId;
 
-	unsigned int seed;
+	ALIGN_TO_CACHE_LINE unsigned int seed;
 
 	Worker(workerid_t workerId, unsigned int seed) : workerId(workerId), seed(seed) {}