Minor midification in Match and db_scripts.