Weapon selection combo boxes are now updated correctly.