fish: Prepare for the 2.4 update