fix fancy nfc stuff and stuff

Change-Id: I36d06869a15aa22f7c077be6afd9f19af98ad2c0