Breaks dialog fixes