Bug fix
Dialog bugfixes