[Scrutinizer] Fix scrutinizer errors