Fix i18n stuff
Couple build fixes