i18n, strategy and spec fixes