Merge pull request #373 from apache/avoid_warnings

Avoid warnings