Corrected couple calls to cdb: routines