WELD-1766 Minor adjustments