Fixing up cider integration