Fixes the vehicle forge crash.

Fix for #6129.

The only other fixes are involved and are not really possible at this stage in the release cycle. But they should be tackled rather soon.