Small fixes for grenades