Merging fixes