fix some scrutinizer issues