Fix Scrutinizer bugs