Fix issues related to selections.