Fix other scrutinizer issues