Changed upload speed to 203400 which seems to work for my USB to Serial adaptor, remove -b 203400 from tools/upload_serial.bat if this causes a problem, also there seemed to be an issue of EEPROM lib not compiling any more, so I commented out 2 includes which it could not find but seemed not to be needed any more.