Fixes and Translations