Merge fixups