More fixes with getting MAC Address