More work on lang stuff vrt core 2.0, maintaining compability with 1.11.x