Fix a few sporadic test failures
Merge remote-tracking branch 'origin/fastpath'

* origin/fastpath:
  Fix a few sporadic test failures