Retryer library + small fixes.