Updated dependencies
build fixes