Some Fixes with Async