CON-1763 small fixes