am 49f3ffd3: am 194dda10: Fix some warnings

* commit '49f3ffd31e8fddcc90674dfd3857041cf22df1e7':
  Fix some warnings