Fix selectors to make it work with latest CMB2