Cap the total number of hours spent retrying - this will allow us to increase the retry count.
'Final' fix of filename issues.