Add missing @Override annotations