More batch wizard bugfixes