Fix some scrutinizer issues