Correct some protobuf field paths