Fix some scrutinizer issues.