Merge conflict fixes
Additional merge fixes