am aa0dd586: Fix some warnings

* commit 'aa0dd58622335c458af9afc0e0656e4664293087':
  Fix some warnings