A few code sniffer changes