More endpoint IDs, CBL2 CTS->DATA fix