ng pnpid for mac in bridgemode and fixing some edge cases