Scrutinizer and CS Fixes