minor changes for cb compat