Fix bug in resume computation
Add polling for long time computations