Async nits from issue #1511

Async nits from issue #1511