More changes to support 2-letter codes