flow: some more missing bits