Small fixes when nothing is found