Improvements to language handling