(CDB) Some minor bug fixes
(CR) Fix some minor bug