Commit 17ef678ca543d8b56035e36039ee319c12d0d249

Russell Belfer 2014-04-21T11:55:57

Fix some coverity-found issues