Fix overridable option fields.