am e0b5c555: am 49f3ffd3: am 194dda10: Fix some warnings

* commit 'e0b5c5557f713c69d50de6137922f9e3d0c8fc43':
  Fix some warnings