Code sniffer fixes