Make some changes suggested by static code analysis