- Minor fixes integrating the new Language class.