am 38a9f405: am e95d192f: Mainly fix two mistakes that I made:

Merge commit '38a9f4050ac4b299c459e25bfff6b852bc8de54f'

* commit '38a9f4050ac4b299c459e25bfff6b852bc8de54f':
  Mainly fix two mistakes that I made: