am c953898b: Fix issues that occurred due to building with clang

* commit 'c953898b983d70658e0decf19f48fff3ac462cf7':
  Fix issues that occurred due to building with clang