Some scrutinizer fixes
Merge branch 'feature/scrutinizer' into develop