Fix up some wiring so the selection block actually gets called