fixes for cdb