[PATCH 21.4] Collected fixes from static checkers