Loadout/GB general fixes