PHP sniffer fixes