Upload tweaks