Fix some sonar complaints.
Merge pull request #708 from nla/bug/acm-sonar

Fix some sonar complaints.