diff --git a/.travis.yml b/.travis.yml
index 4885b54b..d3dcfb3b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -8,9 +8,7 @@ script:
   - wget -O arduino.tar.xz https://www.arduino.cc/download.php?f=/arduino-nightly-linux64.tar.xz
   - tar xf arduino.tar.xz
   - mv arduino-nightly $HOME/arduino_ide
-  - mkdir -p $HOME/Arduino/hardware
-  - mkdir -p $HOME/Arduino/libraries
-  - cd $HOME/Arduino/hardware
+  - cd $HOME/arduino_ide/hardware
   - mkdir espressif
   - cd espressif
   - ln -s $TRAVIS_BUILD_DIR esp32
diff --git a/tools/build.py b/tools/build.py
index 148f3964..dde5a2e9 100755
--- a/tools/build.py
+++ b/tools/build.py
@@ -46,7 +46,7 @@ def compile(tmp_dir, sketch, tools_dir, hardware_dir, ide_path, f, args):
     # Debug=Serial,DebugLevel=Core____
     cmd += '-fqbn=espressif:esp32:{board_name}:' \
             'FlashFreq={flash_freq},' \
-            'UploadSpeed=921600'
+            'UploadSpeed=921600'.format(**vars(args))
     cmd += ' '
     cmd += '-ide-version=10607 '
     cmd += '-warnings={warnings} '.format(**vars(args))