Language handling improvements