Mark override methods with override
(cherry picked from commit 6247faf0817f73d42bcbc53757f53a308be15e41)