More selection drawing hacks