[PATCH v2 0/1] Some more static checker fixes