Fixes to properly resolve locale types.

Fixes to properly resolve locale types.