Small fixes for fake_scan