Some spec changes