Clarifications to the spec