More fixes to go to 1.6