More fixes to specification