Localization Helpers and Bug Fixes