Safeshot tweaks