WELD-1802 Small modifications