am 6b0afa7e: am 36e3fb8d: am 7a6bd46d: Merge "A couple of fixes"

* commit '6b0afa7eecaa2e4faff5b12218af692a363d3d53':
  A couple of fixes