CDB-2566 small fixes and some specs