Additional changes for cider compatibility