Fix issues after merging.