Intrduced Scrutinizer fixes.