US2: Minor fixes to dialog's and dialog controller's logic.