Fix (some of the) issues reported by the static analysis scan.

Heinrich Schindlerrequested to merge
static-analysis into master

Merge request reports