Fix last dialogue problems