More wizard improvements.