Trivial changes for retry