+ fixes for ExtendedLang features