Fixes for languages functionality