Fix issues introduced when rebasing master against react-autocomplete.