Fix cider issues