Fixed NFC and SE implementation issues.