More fixes and language cleanup