various fixes

various fixes reflecting development in dependencies