Small changes to Projectile & Weapon