Some dialogue fixes