Fix asynch calls