Minor changes for flow