Fixed some issues with internationalisation