Few bug fixes
Roll back uploader to an earlier version