Minor cleaning after merges