More merging fixes