minor app flow fixes