CIDER tweaks