Some code sniffer fixes.