Cbs minor speed improvements