Scutinizer fixes