Fix v/hcard errors, part 2.