More mac changes
Firmware upload fixes