Static analysis fixes.
3 files changed