Minor changes to enable overriding of Weld version