Merge pull request #1789 from sjinks/1.2.5

[1.2.5] Fix errors found by static code analyzers