upgrade to latest libs
more lib-upgrade fixes