Minor fixes to spec to pass W3C pubrules.