Some changes to the spec.