am 7a6bd46d: Merge "A couple of fixes"

* commit '7a6bd46dc1a67e79afe1045877cf0115d43a6be8':
  A couple of fixes