WELD-942: corrected/removed high priority warnings