Resolve some issues with selectors
Version bump