Fix some protobuf issues (unnecessary imports, missing syntax) detected with a