Tweaking specs some more