More Async message fixes