Some small scrutinizer fixes