Small fixes
Trying to optimize calls to Locale.getDefault()