Improvements on the app flow control.