first dialog fixes