Flow driver: auto-format fixes