CLM-2839 and CLM-2846 Minor type fixed.