Merge "Misc simple sonar issue fixes"