am dbb1e6af: Fix some more.

* commit 'dbb1e6af7fc82ac5f615e46ddaa93ba1ee7c0094':
  Fix some more.