Implement scrutinizer fixes