Update for libavl changes.