am a0915abd: Merge "Fix build some more"

* commit 'a0915abd2fb57113bc46e8d8fe5013ca4a9ef6e8':
  Fix build some more