[WIP] [BUGFIX] Upload error fix + small other fixes