Fixed issues building valve-selectors.