Minor fixes from pull request review
I forgot to commit my PR review changes before merging the branch, hence this merge.

Merge branch 'jdob-async-base-commands'