Update references to FlatMap

[ci skip]