Fixed some inconsistencies in the spec.