More fixes to go to 1.6
More fixes to go to 1.6