non-mergekeeper flow fixes