Fixes scrutinizer issues