Small changes for dialog creation