Dialog bug fixes