Weapon display fixup