In functional/forward, minor changes.