Adding fixes made by resscode for US numbers, Windows matching, and EC/GP metadata
Fixing extension-matching initialization problem