Fix some bugs with artist merging.