Minor impl changes in WizardCommandController