Some little changes like improved file renaming while upload