More cx/_ changes