Fixup SCM connection