Some fixes in relation to Arduino 1.5.8 and the upload tool.