fish updates that I'm not using (master)