Merge this section into flatfish specific things.