Fixes for library updates