Fix clean and upload thor tasks