Some issues with I18n


This is part of #368