Tweak inputs and fix folder deletion