JC-1428 small fixes