Bug fix and simplification for CUDA X Buffer Ops