Fixes scm agent, search for scm server