Fix two scrutinizer issues