fixes for wizard