more updates from forked libraries