More spec changes