Some small changes in all Weapon constructors