Scrutinizer fixes
Merge master