Change how clobber retries are done. Also add some extra data in logs