Fixup some analyzer issues.
Merge branch 'develop' into numist/63
Cleanup and review