Some spec tweaks