Update for compatibility with latest clib