More dialog fixes