small cleanups
Merge branch 'master' into async