Fix for dialog selection and typo fix