Small VCS subsystem fixes

License: MIT/X11