Small tweaks
Consolidate SCM packages