scrutnizer fixes