Fix overlooked issues in verify_file routine