Fixes in Setup Wizard and Attachments