Fix a number of default locale issues.

See http://elliotth.blogspot.com/2012/01/beware-convenience-methods.html

Change-Id: I1f1e8dba6bbe862fcefc4bbde7d3eb0dfaf15982