small changes to adapt to library changes