More fixes to the spec