Avoid using minimized numbers for address matching

See commits for an explanation