Localization fixes
Close #46