Various changes for new Cider