More fixes related to the merge