minor fixes
Incremental retry on auth
Fixes for testing failures
Fix: actually accumulate keys