Fix latest Scrutinizer reported errors