More fixes for the merge