Fix scripts to use cid and sid