Some corrections over the dialog at devices