fix a few bugs and peg just-i18n version