Added some tricks for localization