Fix some scrutinizer reports