Fixed issues with scruitinizer