Correct multiple bugs
Merge branch 'master' of github.com:eisq/scpm into validation