Push a few more brew changes upstream