Configuration wizard improvements