Update for next dev version of joni