Do not reset window title after language change plus minor fixes