more scrutinzer fixes