Fix some static analyser issues
am: 300dae7c38

* commit '300dae7c38e6853148a998dfc1030b2be40490b5':
  Fix some static analyser issues