Core/SA: Fix some issues as analyzed by coverity and iron code style out a bit.
Merge pull request #12586 from Ascathor/master

Core/SA: Fix some issues as analyzed by coverity and iron code style out...