Some fixups for identity verification