Scrutinizer and cs fixes