Improved some find_working calls.