Apply scrutinizer fixes