Fix long running requests