DialogBox: Some fixes