Update for discoutils 0.22