Two grenades/bombs related fixes (including fix for exploitable bug)