Upgrade save control states