Address some of Coverity's concerns