Minor fixes for language token