Scrutinizer feedback tweaks