Fix issues with scruitinizer