expose some @Override annotations

Check that the code changes look sane and that all the jobs remain green.