am a80e74b7: am dbb1e6af: Fix some more.

* commit 'a80e74b710e3bc262395c7dbbfa3a82eb189ceb1':
  Fix some more.