fmap: fix a couple near-matches