Fixed Scrutinizer issues