Fixes for global locale