[z2026] Add some override correctness

(based on commit 118ce72)
(based on commit 47e8f8a)

Signed-off-by: Nighoo <nighoo@overninethousand.de>

(cleaned version of 942e637)

(based on commit [s1638] - 1f44458)