Changes required after the CB's API client code changes (the API client
now has its own package "api")
serious bugfix
bug fix