am a9ea7a68: am aa0dd586: Fix some warnings

* commit 'a9ea7a68421d173e8c17a838dee396e2cc2dfb71':
  Fix some warnings