third-party CB fixes