Merging cleanup fixes