Merge pull request #135 from apache/small-fixes

Small fixes