[PATCH 0/2] Fix some coding issues