More fixes for 2.9.1