Fix various small issues left behind branch cut

No match.