fixed static analyzer warnings

I noticed these static analyzer warnings last time I built our app.  Thought I'd fix 'em for you.  I signed your CLA doc.