Add NSHardware and NSHostname, fix broken import