Add couple changes just for the halibut.