Misc scrutinzer fixes.