less reload timeout for commits
Cleanup and fix remote retry