iterative_source_detect fixes