Fixing up some scm stuff.