Additional changes to spec.