NFC build fixes?