[PATCH 0/3] Fix some coding issues