More spec tweaks