Small fixups to docs Makefile.am and nfc support