Fix some errors I missed
Merge remote-tracking branch 'upstream/master'

* upstream/master:
  Fix some errors I missed