various updates to match library changes