Update Scrutinizer config
More fixes