Pulling up dependencies to current snapshot

These changes were needed for me to get the build working