(CDB) Fix some small tooltip bugs