Fix some quirks on person merging