Some fixing and uploads management