Fixed VCS screwups.