am 419e196e: Improve debug logs and minor clean-up

* commit '419e196e639c8adb875da2765abcef95017b6d4a':
  Improve debug logs and minor clean-up