Shooting bug fixes