Fix incorrect overrides