minor flow fixes