Fix of some previously-introduced bugs
Weapons are no longer Entities