Fixed some stuff with scanning URLs