Safe shot tweaks and Radial menu fix