Bugfixes to dialog and download logic...