A few localization fixes

Fixed a few issues on localization.