flow fixes