wizard fixes