Update to latest versions of things
Minor work on resolving protobuf schema into something more palatable internally