I18n, some bugs fixed