Miscellaneous fixes to the spec