Loadout fixes
Merge pull request #1370 from fruitwasp/master

Loadout fixes