Language changing fixes