More fixed scrutinizer issues