Fixing scruitinizer issues