more scrutinizer check tweaking