More fixes to changes