Updates to match recent flump changes.