Updates for dependencies, temporary patch for RDO

Working out problems with the dependencies.