Tweaks to fun scanning feature