[2.2] TODO fixes

This PR resolves all the remaining TODO 2.2 comments.
Absolutely. But there's added logging about the counters if that happens (every 30 secs in such a loop). Just like any other bug it will be found and fix if that happens.