Fix some issues with changing language at run-time