Fixes for WeaponCard