Specification fixes