JC-1699  Minor adjustments.