Various language level fixes