More NFC related stuff and fixed u8951.mk error