Language level fixes