More extensive Scrutinizer checks