More static analysis fixes from Ashwini Sharma.
4 files changed