More fixes to merge