Make satfind and scan fix patch more readable