facility wizard fixes