Some fixes in the spec