ModalDialog builder fixes