Basic fixes for selection functions