Fix some Scrutinizer issues
Merge pull request #300 from wmde/scrutIssues

Fix some Scrutinizer issues