Improved language handling.