Some merging fixes