Some old tweaks to the RFID module
Resolved conflicts