More fixes for the release of 2.1.2