am c5d2a7b0: Merge "Fixing some small issues."

* commit 'c5d2a7b0d6b85999731cc82ff945635fdea1e670':
  Fixing some small issues.