More selection drawing fixes