fish: Fix compiling with master