FIX Scrutinizer ISSUES