More Grenade Fixes