Wizard cmdlets - bug fixes.