Some protobuf fixes
More stuff builds