NewStateSet: minor changes