Fix VCS things

**Resolves #590**.