Added fixes to get protobuf stuff working properly.