Small bugfixes for the CBTOOL API service