Fixing upload issues