Fixes for library changes