More fixes for 2.07