Some fixes the compiler pointed out to me (#4482)

* Fix bug in availability-distribution.

Old fetches would not get cancelled as intended.

* Fix a few more warnings.