A few more spec changes