Added NFC shim + tests. Minor cleanups