More tweaks to try and get NFC working