[PATCH 0/2] Some static checker fixes