Fix Scrutinizer bugs
Merge pull request #264 from wagnert/master

Fix Scrutinizer bugs