Fix issues with getting MAC Address