Changes to make RFSniffer work