Fixes for cbs