Small bug fixes to LanguageSupport