Fixed SCM stuff