Scrutinizer first inspection CS fixes