Fix some of the async code for Widget