Apply changes in Kyle's review of NFC DOM