Update to changes in libwheel