WELD-1720 issue. Warnings fixed.