Fixe some scrutinizer issues