Fix some static analysis warnings. (commit: 19bb8f7)
Fix some more static analysis warnings (commit: 9d5c886)