Fix cargo loading/unloading

Closes #4604, #2916, #3514, #3580