Dialog Fixes