Add missing @Override annotations

Also remove bogus inheritDoc on base methods.