More fixes to language!