More fish fixes