Tweaks to spec