Fix selectors and others