More fixes for 1.7