Fixes CVLFAB-266 and also corrects a few issues with error dialogs and
progress bars.