Updates for recent spec tweaks