Make makeshift welder usable

Issue #2282