Apply scrutinizer patches

Minor fixes from scrutinizer.
Make scrutinizer happy :hamster: