Some dialog fixes