Fixes for translation