Concurrency, failure, and offset fixes

@mihasya @chaupt 

FYI - It might be easier to review the individual commits to see the specific fixes.