Several changes regarding MAC address