Fixes Scrutinizer findings.