Optional MAC address and other changes