improvements to verification pre-database-migration