more cb fixes