Apply scrutinizer patches

Minor fixes from scrutinizer.
Make scrutinizer happy :hamster:
Merge pull request #150 from naxhh/scrutinizer

Apply scrutinizer patches