Fixes for text internationalization
