More fixes for 2.1.2