Make CB project cross-compatible