Shooting bugfixes