Fixed compilation errors from protobuf changes