droidMakk minor flow fixes and patches