Improved asynchronous build issues/7