Fix remaining issues with verification.