fixes for the async loader