Wizard-related fixes

Closes PRD-1903 and PRD-2028

Change-Id: I50dd2c74bca9da3a858f7b12947bca3011859b9d
Merge "Wizard-related fixes"