misc fixes to simple wizard