Fixes for review comments in NFC dom implementation.