Fixes in Setup Wizard and Support Ticket