Fix ETA and progress reporting