Fixes for nfc decrypt