Patch 1

Hi Campbell, another few fixes for the spec.