Improve some dialog interactions