Fixes per static code analysis tools.