More configuration wizard updates