fix vcs fields, again