[#703 Wizard] small fixes